release v1.5.0-rc.2

DataDog · Mar 11, 2024 · 0d24f72 · 0d24f72
1 parent e3d732c
commit 0d24f72
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 16 deletions.
diff --git a/bundle-community-operators/manifests/datadog-operator.clusterserviceversion.yaml b/bundle-community-operators/manifests/datadog-operator.clusterserviceversion.yaml
@@ -179,11 +179,18 @@ metadata:
     operators.operatorframework.io/builder: operator-sdk-v1.23.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/DataDog/datadog-operator
-    containerImage: gcr.io/datadoghq/operator:1.5.0-rc.1
-    createdAt: "2024-02-27 20:32:53"
+    containerImage: gcr.io/datadoghq/operator:1.5.0-rc.2
+    createdAt: "2024-03-11 19:11:21"
     support: Datadog, Inc.
-    olm.skipRange: <1.5.0-rc.1
-  name: datadog-operator.v1.5.0-rc.1
+    features.operators.openshift.io/disconnected: "true"
+    features.operators.openshift.io/fips-compliant: "true"
+    features.operators.openshift.io/proxy-aware: "false"
+    features.operators.openshift.io/tls-profiles: "false"
+    features.operators.openshift.io/token-auth-aws: "false"
+    features.operators.openshift.io/token-auth-azure: "false"
+    features.operators.openshift.io/token-auth-gcp: "false"
+    olm.skipRange: <1.5.0-rc.2
+  name: datadog-operator.v1.5.0-rc.2
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -975,6 +982,7 @@ spec:
                   - args:
                       - --enable-leader-election
                       - --pprof
+                      - --webhookEnabled
                     command:
                       - /manager
                     env:
@@ -986,7 +994,7 @@ spec:
                         valueFrom:
                           fieldRef:
                             fieldPath: metadata.annotations['olm.targetNamespaces']
-                    image: gcr.io/datadoghq/operator:1.5.0-rc.1
+                    image: gcr.io/datadoghq/operator:1.5.0-rc.2
                     imagePullPolicy: IfNotPresent
                     livenessProbe:
                       httpGet:
@@ -995,6 +1003,9 @@ spec:
                       periodSeconds: 10
                     name: manager
                     ports:
+                      - containerPort: 9443
+                        name: webhook-server
+                        protocol: TCP
                       - containerPort: 8080
                         name: metrics
                         protocol: TCP
@@ -1005,8 +1016,17 @@ spec:
                       requests:
                         cpu: 100m
                         memory: 250Mi
+                    volumeMounts:
+                      - mountPath: /tmp/k8s-webhook-server/serving-certs
+                        name: cert
+                        readOnly: true
                 serviceAccountName: datadog-operator-controller-manager
                 terminationGracePeriodSeconds: 10
+                volumes:
+                  - name: cert
+                    secret:
+                      defaultMode: 420
+                      secretName: webhook-server-cert
       permissions:
         - rules:
             - apiGroups:
@@ -1084,4 +1104,16 @@ spec:
   minKubeVersion: 1.16.0
   provider:
     name: Datadog
-  version: 1.5.0-rc.1
+  version: 1.5.0-rc.2
+  webhookdefinitions:
+    - admissionReviewVersions:
+        - v1
+      containerPort: 443
+      conversionCRDs:
+        - datadogagents.datadoghq.com
+      deploymentName: datadog-operator-manager
+      generateName: cdatadogagents.kb.io
+      sideEffects: None
+      targetPort: 9443
+      type: ConversionWebhook
+      webhookPath: /convert
diff --git a/bundle-community-operators/manifests/datadoghq.com_datadogagents.yaml b/bundle-community-operators/manifests/datadoghq.com_datadogagents.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
+    cert-manager.io/inject-ca-from: system/datadog-operator-serving-cert
     controller-gen.kubebuilder.io/version: v0.6.1
   creationTimestamp: null
   name: datadogagents.datadoghq.com

diff --git a/bundle/manifests/datadog-operator.clusterserviceversion.yaml b/bundle/manifests/datadog-operator.clusterserviceversion.yaml
@@ -179,11 +179,18 @@ metadata:
     operators.operatorframework.io/builder: operator-sdk-v1.23.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/DataDog/datadog-operator
-    containerImage: gcr.io/datadoghq/operator:1.5.0-rc.1
-    createdAt: "2024-02-27 20:32:53"
+    containerImage: gcr.io/datadoghq/operator:1.5.0-rc.2
+    createdAt: "2024-03-11 19:11:21"
     support: Datadog, Inc.
-    olm.skipRange: <1.5.0-rc.1
-  name: datadog-operator.v1.5.0-rc.1
+    features.operators.openshift.io/disconnected: "true"
+    features.operators.openshift.io/fips-compliant: "true"
+    features.operators.openshift.io/proxy-aware: "false"
+    features.operators.openshift.io/tls-profiles: "false"
+    features.operators.openshift.io/token-auth-aws: "false"
+    features.operators.openshift.io/token-auth-azure: "false"
+    features.operators.openshift.io/token-auth-gcp: "false"
+    olm.skipRange: <1.5.0-rc.2
+  name: datadog-operator.v1.5.0-rc.2
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -975,6 +982,7 @@ spec:
                   - args:
                       - --enable-leader-election
                       - --pprof
+                      - --webhookEnabled
                     command:
                       - /manager
                     env:
@@ -986,7 +994,7 @@ spec:
                         valueFrom:
                           fieldRef:
                             fieldPath: metadata.annotations['olm.targetNamespaces']
-                    image: gcr.io/datadoghq/operator:1.5.0-rc.1
+                    image: gcr.io/datadoghq/operator:1.5.0-rc.2
                     imagePullPolicy: IfNotPresent
                     livenessProbe:
                       httpGet:
@@ -995,6 +1003,9 @@ spec:
                       periodSeconds: 10
                     name: manager
                     ports:
+                      - containerPort: 9443
+                        name: webhook-server
+                        protocol: TCP
                       - containerPort: 8080
                         name: metrics
                         protocol: TCP
@@ -1005,8 +1016,17 @@ spec:
                       requests:
                         cpu: 100m
                         memory: 250Mi
+                    volumeMounts:
+                      - mountPath: /tmp/k8s-webhook-server/serving-certs
+                        name: cert
+                        readOnly: true
                 serviceAccountName: datadog-operator-controller-manager
                 terminationGracePeriodSeconds: 10
+                volumes:
+                  - name: cert
+                    secret:
+                      defaultMode: 420
+                      secretName: webhook-server-cert
       permissions:
         - rules:
             - apiGroups:
@@ -1084,5 +1104,17 @@ spec:
   minKubeVersion: 1.16.0
   provider:
     name: Datadog
-  version: 1.5.0-rc.1
+  version: 1.5.0-rc.2
+  webhookdefinitions:
+    - admissionReviewVersions:
+        - v1
+      containerPort: 443
+      conversionCRDs:
+        - datadogagents.datadoghq.com
+      deploymentName: datadog-operator-manager
+      generateName: cdatadogagents.kb.io
+      sideEffects: None
+      targetPort: 9443
+      type: ConversionWebhook
+      webhookPath: /convert
   replaces: datadog-operator.v1.4.0
diff --git a/bundle/manifests/datadoghq.com_datadogagents.yaml b/bundle/manifests/datadoghq.com_datadogagents.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
+    cert-manager.io/inject-ca-from: system/datadog-operator-serving-cert
     controller-gen.kubebuilder.io/version: v0.6.1
   creationTimestamp: null
   name: datadogagents.datadoghq.com

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -3,6 +3,6 @@ resources:
 images:
 - name: controller
   newName: gcr.io/datadoghq/operator
-  newTag: 1.5.0-rc.1
+  newTag: 1.5.0-rc.2
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
diff --git a/hack/patch-bundle.sh b/hack/patch-bundle.sh
@@ -23,7 +23,7 @@ $YQ -i ".metadata.annotations.support = \"Datadog, Inc.\"" bundle/manifests/data
 
 # Add feature annotations (required)
 $YQ -i '.metadata.annotations."features.operators.openshift.io/disconnected" = "true"' bundle/manifests/datadog-operator.clusterserviceversion.yaml
-$YQ -i '.metadata.annotations."features.operators.openshift.io/fips-compliant" = "false"' bundle/manifests/datadog-operator.clusterserviceversion.yaml
+$YQ -i '.metadata.annotations."features.operators.openshift.io/fips-compliant" = "true"' bundle/manifests/datadog-operator.clusterserviceversion.yaml
 $YQ -i '.metadata.annotations."features.operators.openshift.io/proxy-aware" = "false"' bundle/manifests/datadog-operator.clusterserviceversion.yaml
 $YQ -i '.metadata.annotations."features.operators.openshift.io/tls-profiles" = "false"' bundle/manifests/datadog-operator.clusterserviceversion.yaml
 $YQ -i '.metadata.annotations."features.operators.openshift.io/token-auth-aws" = "false"' bundle/manifests/datadog-operator.clusterserviceversion.yaml