Skip to content

Commit 58f215b

Browse files
eloytoroeloytoro
authored
Merge branch 'main' into eloytoro/add-error-tracking-standalone-var-core-agent
2 parents 8186fd3 + 8a48b5e commit 58f215b

18 files changed

+1454
-185
lines changed

‎.github/workflows/backport-pr.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Backport PR
2+
on:
3+
pull_request:
4+
types: [ labeled, closed ]
5+
6+
permissions: {}
7+
8+
jobs:
9+
backport:
10+
name: Backport PR
11+
runs-on: ubuntu-latest
12+
if: >
13+
github.event.pull_request.merged
14+
&& (
15+
( github.event.action == 'closed' && contains(github.event.label.name, 'backport') )
16+
||
17+
( github.event.action == 'labeled' && contains(github.event.label.name, 'backport') )
18+
)
19+
permissions:
20+
contents: write
21+
pull-requests: write
22+
steps:
23+
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
24+
id: app-token
25+
with:
26+
app-id: ${{ vars.DD_GITHUB_TOKEN_GENERATOR_APP_ID }}
27+
private-key: ${{ secrets.DD_GITHUB_TOKEN_GENERATOR_PRIVATE_KEY }}
28+
- uses: tibdex/backport@9565281eda0731b1d20c4025c43339fb0a23812e # v2.0.4
29+
with:
30+
label_pattern: "^backport/(?<base>([^ ]+))$"
31+
labels_template: "<%= JSON.stringify([...labels, 'backport', 'bot']) %>"
32+
github_token: ${{ steps.app-token.outputs.token }}
33+
title_template: "[ Backport <%- base %> ] <%- title %>"
34+
body_template: |
35+
Backport <%- mergeCommitSha %> from #<%- number %>.
36+
37+
___
38+
39+
<%- body %>

‎.gitlab-ci.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ stages:
2929
- image
3030
- test-image
3131
- release
32+
- release-latest
3233
- e2e
3334
- post-release
3435
- deploy
@@ -297,7 +298,7 @@ publish_redhat_public_tag_fips:
297298
IMG_DESTINATIONS: $RH_PARTNER_PROJECT_ID:$CI_COMMIT_TAG-fips
298299

299300
publish_public_latest:
300-
stage: release
301+
stage: release-latest
301302
rules:
302303
- if: $CI_COMMIT_TAG
303304
when: manual
@@ -319,7 +320,7 @@ publish_public_latest_fips:
319320
IMG_DESTINATIONS: operator:latest-fips
320321

321322
publish_redhat_public_latest:
322-
stage: release
323+
stage: release-latest
323324
rules:
324325
- if: $CI_COMMIT_TAG
325326
when: manual
@@ -547,6 +548,7 @@ check_preflight_redhat_image:
547548
# Preflight now supports multiarch image checks
548549
submit_preflight_redhat_image:
549550
stage: post-release
551+
allow_failure: true
550552
rules:
551553
- if: $CI_COMMIT_TAG
552554
when: manual
@@ -568,8 +570,10 @@ publish_community_operators:
568570
- if: $CI_COMMIT_TAG
569571
when: manual
570572
- when: never
571-
needs:
572-
- "submit_preflight_redhat_image"
573+
# Allow the job to be run manually even if submit_preflight_redhat_image fails, so that
574+
# preflight submission can be retried locally followed by this manual job trigger in the pipeline
575+
# needs:
576+
# - "submit_preflight_redhat_image"
573577
tags: [ "runner:docker", "size:large" ]
574578
image: $JOB_DOCKER_IMAGE
575579
before_script:

‎Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ RUN if [ "$FIPS_ENABLED" = "true" ]; then \
4545

4646
RUN CGO_ENABLED=0 GOOS=linux GOARCH=${GOARCH} GO111MODULE=on go build -a -ldflags "${LDFLAGS}" -o helpers cmd/helpers/main.go
4747

48-
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
48+
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest AS certs
49+
50+
FROM registry.access.redhat.com/ubi9/ubi-micro:latest
4951

5052
LABEL name="datadog/operator"
5153
LABEL vendor="Datadog Inc."
@@ -55,6 +57,9 @@ LABEL description="Datadog provides a modern monitoring and analytics platform.
5557
Datadog Operator."
5658
LABEL maintainer="Datadog Inc."
5759

60+
# ubi-micro variant does not have CA certificates installed
61+
COPY --from=certs /etc/pki/tls/certs/ca-bundle.crt /etc/ssl/certs/ca-bundle.crt
62+
5863
WORKDIR /
5964
COPY --from=builder /workspace/manager .
6065

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ SHELL = /usr/bin/env bash -o pipefail
88
# Datadog custom variables
99
#
1010
BUILDINFOPKG=github.com/DataDog/datadog-operator/pkg/version
11-
GIT_TAG?=$(shell git tag -l --contains HEAD | tail -1)
12-
TAG_HASH=$(shell git tag | tail -1)_$(shell git rev-parse --short HEAD)
11+
GIT_TAG?=$(shell git tag | tr - \~ | sort -V | tr \~ - | tail -1)
12+
TAG_HASH=$(shell git tag | tr - \~ | sort -V | tr \~ - | tail -1)_$(shell git rev-parse --short HEAD)
1313
IMG_VERSION?=$(if $(VERSION),$(VERSION),latest)
1414
VERSION?=$(if $(GIT_TAG),$(GIT_TAG),$(TAG_HASH))
1515
GIT_COMMIT?=$(shell git rev-parse HEAD)
@@ -354,7 +354,7 @@ bin/$(PLATFORM)/operator-manifest-tools: Makefile
354354
hack/install-operator-manifest-tools.sh 0.6.0
355355

356356
bin/$(PLATFORM)/preflight: Makefile
357-
hack/install-openshift-preflight.sh 1.11.1
357+
hack/install-openshift-preflight.sh latest
358358

359359
bin/$(PLATFORM)/openapi-gen:
360360
mkdir -p $(ROOT)/bin/$(PLATFORM)

‎bundle/manifests/datadog-operator.clusterserviceversion.yaml‎

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,12 @@ metadata:
194194
]
195195
capabilities: Full Lifecycle
196196
categories: Monitoring, Logging & Tracing
197-
createdAt: "2025-02-11 18:13:00"
197+
createdAt: "2025-03-17 18:00:52"
198198
description: Datadog provides a modern monitoring and analytics platform. Gather metrics, logs and traces for full observability of your Kubernetes cluster with Datadog Operator.
199199
operators.operatorframework.io/builder: operator-sdk-v1.34.1
200200
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
201201
repository: https://github.com/DataDog/datadog-operator
202-
containerImage: gcr.io/datadoghq/operator:1.12.1
202+
containerImage: gcr.io/datadoghq/operator:1.13.0
203203
support: Datadog, Inc.
204204
features.operators.openshift.io/disconnected: "true"
205205
features.operators.openshift.io/fips-compliant: "false"
@@ -208,12 +208,12 @@ metadata:
208208
features.operators.openshift.io/token-auth-aws: "false"
209209
features.operators.openshift.io/token-auth-azure: "false"
210210
features.operators.openshift.io/token-auth-gcp: "false"
211-
olm.skipRange: '>=1.7.0 <1.12.1'
211+
olm.skipRange: '>=1.7.0 <1.13.0'
212212
labels:
213213
operatorframework.io/arch.amd64: supported
214214
operatorframework.io/arch.arm64: supported
215215
operatorframework.io/os.linux: supported
216-
name: datadog-operator.v1.12.1
216+
name: datadog-operator.v1.13.0
217217
namespace: placeholder
218218
spec:
219219
apiservicedefinitions: {}
@@ -252,6 +252,11 @@ spec:
252252
kind: DatadogPodAutoscaler
253253
name: datadogpodautoscalers.datadoghq.com
254254
version: v1alpha1
255+
- description: DatadogPodAutoscaler is the Schema for the datadogpodautoscalers API
256+
displayName: Datadog Pod Autoscaler
257+
kind: DatadogPodAutoscaler
258+
name: datadogpodautoscalers.datadoghq.com
259+
version: v1alpha2
255260
- description: DatadogSLO allows a user to define and manage datadog SLOs from Kubernetes cluster.
256261
displayName: Datadog SLO
257262
kind: DatadogSLO
@@ -276,7 +281,12 @@ spec:
276281
resources:
277282
- componentstatuses
278283
- deployments
284+
- limitranges
279285
- namespaces
286+
- persistentvolumeclaims
287+
- persistentvolumes
288+
- replicationcontrollers
289+
- resourcequotas
280290
verbs:
281291
- get
282292
- list
@@ -299,17 +309,6 @@ spec:
299309
- patch
300310
- update
301311
- watch
302-
- apiGroups:
303-
- ""
304-
resources:
305-
- limitranges
306-
- persistentvolumeclaims
307-
- persistentvolumes
308-
- replicationcontrollers
309-
- resourcequotas
310-
verbs:
311-
- list
312-
- watch
313312
- apiGroups:
314313
- ""
315314
resources:
@@ -328,6 +327,12 @@ spec:
328327
- nodes/stats
329328
verbs:
330329
- get
330+
- apiGroups:
331+
- ""
332+
resources:
333+
- pods/exec
334+
verbs:
335+
- create
331336
- apiGroups:
332337
- '*'
333338
resources:
@@ -404,12 +409,8 @@ spec:
404409
verbs:
405410
- create
406411
- get
407-
- apiGroups:
408-
- authorization.k8s.io
409-
resources:
410-
- pods/exec
411-
verbs:
412-
- create
412+
- list
413+
- watch
413414
- apiGroups:
414415
- authorization.k8s.io
415416
resources:
@@ -462,6 +463,7 @@ spec:
462463
resources:
463464
- certificatesigningrequests
464465
verbs:
466+
- get
465467
- list
466468
- watch
467469
- apiGroups:
@@ -538,6 +540,7 @@ spec:
538540
verbs:
539541
- create
540542
- delete
543+
- get
541544
- list
542545
- watch
543546
- apiGroups:
@@ -551,11 +554,6 @@ spec:
551554
- datadoghq.com
552555
resources:
553556
- extendeddaemonsetreplicasets
554-
verbs:
555-
- get
556-
- apiGroups:
557-
- datadoghq.com
558-
resources:
559557
- watermarkpodautoscalers
560558
verbs:
561559
- get
@@ -569,6 +567,13 @@ spec:
569567
- get
570568
- list
571569
- watch
570+
- apiGroups:
571+
- metrics.eks.amazonaws.com
572+
resources:
573+
- kcm/metrics
574+
- ksh/metrics
575+
verbs:
576+
- get
572577
- apiGroups:
573578
- networking.k8s.io
574579
resources:
@@ -621,6 +626,7 @@ spec:
621626
- storageclasses
622627
- volumeattachments
623628
verbs:
629+
- get
624630
- list
625631
- watch
626632
serviceAccountName: datadog-operator-controller-manager
@@ -678,7 +684,7 @@ spec:
678684
fieldPath: metadata.annotations['olm.targetNamespaces']
679685
- name: DD_TOOL_VERSION
680686
value: redhat
681-
image: gcr.io/datadoghq/operator:1.12.1
687+
image: gcr.io/datadoghq/operator:1.13.0
682688
imagePullPolicy: IfNotPresent
683689
livenessProbe:
684690
httpGet:
@@ -776,5 +782,5 @@ spec:
776782
minKubeVersion: 1.16.0
777783
provider:
778784
name: Datadog
779-
version: 1.12.1
780-
replaces: datadog-operator.v1.12.0
785+
version: 1.13.0
786+
replaces: datadog-operator.v1.12.1

0 commit comments

Comments
 (0)