release v1.0.0-rc.5

DataDog · Jan 4, 2023 · 01e9f80 · 01e9f80
1 parent 037c2cc
commit 01e9f80
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 14 deletions.
diff --git a/bundle/manifests/datadog-operator.clusterserviceversion.yaml b/bundle/manifests/datadog-operator.clusterserviceversion.yaml
@@ -94,9 +94,9 @@ 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.0.0-rc.4
-    olm.skipRange: <1.0.0-rc.4
-  name: datadog-operator.v1.0.0-rc.4
+    containerImage: gcr.io/datadoghq/operator:1.0.0-rc.5
+    olm.skipRange: <1.0.0-rc.5
+  name: datadog-operator.v1.0.0-rc.5
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -828,7 +828,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: gcr.io/datadoghq/operator:1.0.0-rc.4
+                image: gcr.io/datadoghq/operator:1.0.0-rc.5
                 imagePullPolicy: IfNotPresent
                 livenessProbe:
                   httpGet:
@@ -930,7 +930,7 @@ spec:
   minKubeVersion: 1.16.0
   provider:
     name: Datadog
-  version: 1.0.0-rc.4
+  version: 1.0.0-rc.5
   webhookdefinitions:
   - admissionReviewVersions:
     - v1

diff --git a/bundle/manifests/datadoghq.com_datadogagents.yaml b/bundle/manifests/datadoghq.com_datadogagents.yaml
@@ -4369,15 +4369,22 @@ spec:
                     properties:
                       jmxEnabled:
                         description: Define whether the Agent image should support
-                          JMX.
+                          JMX. To be used if the Name field does not correspond to
+                          a full image string.
                         type: boolean
                       name:
                         description: 'Define the image to use: Use "gcr.io/datadoghq/agent:latest"
                           for Datadog Agent 7. Use "datadog/dogstatsd:latest" for
                           standalone Datadog Agent DogStatsD 7. Use "gcr.io/datadoghq/cluster-agent:latest"
                           for Datadog Cluster Agent. Use "agent" with the registry
                           and tag configurations for <registry>/agent:<tag>. Use "cluster-agent"
-                          with the registry and tag configurations for <registry>/cluster-agent:<tag>.'
+                          with the registry and tag configurations for <registry>/cluster-agent:<tag>.
+                          If the name is full image string - `<name>:<tag>` or `<registry>/<name>:<tag>`,
+                          `tag` and `jmxEnabled` values are ignored, so is `global.registry`.
+                          Otherwise, image string is created by overriding default
+                          settings with supplied `name`, `tag` and `jmxEnabled` values;
+                          image string is created using default registry unless `global.registry`
+                          is configured.'
                         type: string
                       pullPolicy:
                         description: 'The Kubernetes pull policy: Use Always, Never
@@ -8691,15 +8698,22 @@ spec:
                     properties:
                       jmxEnabled:
                         description: Define whether the Agent image should support
-                          JMX.
+                          JMX. To be used if the Name field does not correspond to
+                          a full image string.
                         type: boolean
                       name:
                         description: 'Define the image to use: Use "gcr.io/datadoghq/agent:latest"
                           for Datadog Agent 7. Use "datadog/dogstatsd:latest" for
                           standalone Datadog Agent DogStatsD 7. Use "gcr.io/datadoghq/cluster-agent:latest"
                           for Datadog Cluster Agent. Use "agent" with the registry
                           and tag configurations for <registry>/agent:<tag>. Use "cluster-agent"
-                          with the registry and tag configurations for <registry>/cluster-agent:<tag>.'
+                          with the registry and tag configurations for <registry>/cluster-agent:<tag>.
+                          If the name is full image string - `<name>:<tag>` or `<registry>/<name>:<tag>`,
+                          `tag` and `jmxEnabled` values are ignored, so is `global.registry`.
+                          Otherwise, image string is created by overriding default
+                          settings with supplied `name`, `tag` and `jmxEnabled` values;
+                          image string is created using default registry unless `global.registry`
+                          is configured.'
                         type: string
                       pullPolicy:
                         description: 'The Kubernetes pull policy: Use Always, Never
@@ -12096,15 +12110,22 @@ spec:
                     properties:
                       jmxEnabled:
                         description: Define whether the Agent image should support
-                          JMX.
+                          JMX. To be used if the Name field does not correspond to
+                          a full image string.
                         type: boolean
                       name:
                         description: 'Define the image to use: Use "gcr.io/datadoghq/agent:latest"
                           for Datadog Agent 7. Use "datadog/dogstatsd:latest" for
                           standalone Datadog Agent DogStatsD 7. Use "gcr.io/datadoghq/cluster-agent:latest"
                           for Datadog Cluster Agent. Use "agent" with the registry
                           and tag configurations for <registry>/agent:<tag>. Use "cluster-agent"
-                          with the registry and tag configurations for <registry>/cluster-agent:<tag>.'
+                          with the registry and tag configurations for <registry>/cluster-agent:<tag>.
+                          If the name is full image string - `<name>:<tag>` or `<registry>/<name>:<tag>`,
+                          `tag` and `jmxEnabled` values are ignored, so is `global.registry`.
+                          Otherwise, image string is created by overriding default
+                          settings with supplied `name`, `tag` and `jmxEnabled` values;
+                          image string is created using default registry unless `global.registry`
+                          is configured.'
                         type: string
                       pullPolicy:
                         description: 'The Kubernetes pull policy: Use Always, Never
@@ -15806,7 +15827,8 @@ spec:
                       properties:
                         jmxEnabled:
                           description: Define whether the Agent image should support
-                            JMX.
+                            JMX. To be used if the Name field does not correspond
+                            to a full image string.
                           type: boolean
                         name:
                           description: 'Define the image to use: Use "gcr.io/datadoghq/agent:latest"
@@ -15815,7 +15837,13 @@ spec:
                             for Datadog Cluster Agent. Use "agent" with the registry
                             and tag configurations for <registry>/agent:<tag>. Use
                             "cluster-agent" with the registry and tag configurations
-                            for <registry>/cluster-agent:<tag>.'
+                            for <registry>/cluster-agent:<tag>. If the name is full
+                            image string - `<name>:<tag>` or `<registry>/<name>:<tag>`,
+                            `tag` and `jmxEnabled` values are ignored, so is `global.registry`.
+                            Otherwise, image string is created by overriding default
+                            settings with supplied `name`, `tag` and `jmxEnabled`
+                            values; image string is created using default registry
+                            unless `global.registry` is configured.'
                           type: string
                         pullPolicy:
                           description: 'The Kubernetes pull policy: Use Always, Never

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.0.0-rc.4
+  newTag: 1.0.0-rc.5
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization