Update Operator addon to Operator 1.4.0 (#1347)

charts/datadog-crds/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.4.0
+* Update CRDs from Datadog Operator v1.4.0 tag.
+
+## 1.3.1
+* Migrate from `kubeval` to `kubeconform` for ci chart validation.
+
 ## 1.3.0
 * Update CRDs from Datadog Operator v1.3.0 tag.
 

charts/datadog-crds/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: datadog-crds
 description: Datadog Kubernetes CRDs chart
-version: 1.3.0
+version: 1.4.0
 appVersion: "1"
 keywords:
 - monitoring

charts/datadog-crds/README.md

@@ -1,6 +1,6 @@
 # Datadog CRDs
 
-![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![AppVersion: 1](https://img.shields.io/badge/AppVersion-1-informational?style=flat-square)
+![Version: 1.4.0](https://img.shields.io/badge/Version-1.4.0-informational?style=flat-square) ![AppVersion: 1](https://img.shields.io/badge/AppVersion-1-informational?style=flat-square)
 
 This chart was designed to allow other "datadog" charts to share `CustomResourceDefinitions` such as the `DatadogMetric`.
 

charts/datadog-crds/templates/datadoghq.com_datadogagents_v1.yaml

@@ -6349,6 +6349,8 @@ spec:
                       type: object
                     clusterName:
                       type: string
+                    containerStrategy:
+                      type: string
                     credentials:
                       properties:
                         apiKey:
@@ -6376,6 +6378,8 @@ spec:
                       type: object
                     criSocketPath:
                       type: string
+                    disableNonResourceRules:
+                      type: boolean
                     dockerSocketPath:
                       type: string
                     endpoint:
@@ -8275,6 +8279,44 @@ spec:
                     - ready
                     - upToDate
                   type: object
+                agentList:
+                  items:
+                    properties:
+                      available:
+                        format: int32
+                        type: integer
+                      current:
+                        format: int32
+                        type: integer
+                      currentHash:
+                        type: string
+                      daemonsetName:
+                        type: string
+                      desired:
+                        format: int32
+                        type: integer
+                      lastUpdate:
+                        format: date-time
+                        type: string
+                      ready:
+                        format: int32
+                        type: integer
+                      state:
+                        type: string
+                      status:
+                        type: string
+                      upToDate:
+                        format: int32
+                        type: integer
+                    required:
+                      - available
+                      - current
+                      - desired
+                      - ready
+                      - upToDate
+                    type: object
+                  type: array
+                  x-kubernetes-list-type: atomic
                 clusterAgent:
                   properties:
                     availableReplicas:

charts/datadog-operator/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.5.1
+
+* Add configuration for Operator flag `introspectionEnabled`: this parameter is used to enable the Introspection. It is disabled by default.
+
+## 1.5.0
+
+* Update Datadog Operator version to 1.4.0.
+
+## 1.4.2
+
+* Migrate from `kubeval` to `kubeconform` for ci chart validation.
+
 ## 1.4.1
 
 * Add configuration for Operator flag `datadogSLOEnabled` : this parameter is used to enable the Datadog SLO Controller. It is disabled by default.

charts/datadog-operator/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: datadog-crds
   repository: file://../datadog-crds/
-  version: 1.3.0
-digest: sha256:86af5339c70e484401b7d340b2380802c93f946ceb0441d7348f74811917be8b
-generated: "2024-01-04T12:16:01.40644-05:00"
+  version: 1.4.0
+digest: sha256:e8c6cfa94f13dc849deccbf84a8d521ff1c83c2cecaeb79eaf2234e5c83af557
+generated: "2024-03-13T21:12:40.350938-04:00"

charts/datadog-operator/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: datadog-operator
-version: 1.4.1
-appVersion: 1.3.0
+version: 1.5.1
+appVersion: 1.4.0
 description: Datadog Operator
 keywords:
 - monitoring
@@ -17,7 +17,7 @@ maintainers:
   email: support@datadoghq.com
 dependencies:
 - name: datadog-crds
-  version: "=1.3.0"
+  version: "=1.4.0"
   alias: datadogCRDs
   repository: file://../datadog-crds/
   condition: installCRDs

charts/datadog-operator/README.md

@@ -1,6 +1,6 @@
 # Datadog Operator
 
-![Version: 1.4.1](https://img.shields.io/badge/Version-1.4.1-informational?style=flat-square) ![AppVersion: 1.3.0](https://img.shields.io/badge/AppVersion-1.3.0-informational?style=flat-square)
+![Version: 1.5.1](https://img.shields.io/badge/Version-1.5.1-informational?style=flat-square) ![AppVersion: 1.4.0](https://img.shields.io/badge/AppVersion-1.4.0-informational?style=flat-square)
 
 ## Values
 
@@ -30,15 +30,16 @@
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` | Define the pullPolicy for Datadog Operator image |
 | image.repository | string | `"709825985650.dkr.ecr.us-east-1.amazonaws.com/datadog/operator"` | Repository to use for Datadog Operator image |
-| image.tag | string | `"1.0.3"` | Define the Datadog Operator version to use |
+| image.tag | string | `"1.4.0"` | Define the Datadog Operator version to use |
 | imagePullSecrets | list | `[]` | Datadog Operator repository pullSecret (ex: specify docker registry credentials) |
 | installCRDs | bool | `true` | Set to true to deploy the Datadog's CRDs |
+| introspection.enabled | bool | `false` | If true, enables introspection feature (beta). Requires v1.4.0+ |
 | logLevel | string | `"info"` | Set Datadog Operator log level (debug, info, error, panic, fatal) |
 | maximumGoroutines | string | `nil` | Override default goroutines threshold for the health check failure. |
 | metricsPort | int | `8383` | Port used for OpenMetrics endpoint |
 | nameOverride | string | `""` | Override name of app |
 | nodeSelector | object | `{}` | Allows to schedule Datadog Operator on specific nodes |
-| operatorMetricsEnabled | string | `"true"` | Enable forwarding of Datadog Operator metrics and events to Datadog. |
+| operatorMetricsEnabled | string | `"false"` | Enable forwarding of Datadog Operator metrics and events to Datadog. |
 | podAnnotations | object | `{}` | Allows setting additional annotations for Datadog Operator PODs |
 | podLabels | object | `{}` | Allows setting additional labels for for Datadog Operator PODs |
 | rbac.create | bool | `true` | Specifies whether the RBAC resources should be created |
@@ -98,7 +99,7 @@ and for the Datadog Operator chart:
 
 ```
 NAME                    	CHART VERSION	APP VERSION	DESCRIPTION
-datadog/datadog-operator	1.0.4        	1.0.3      	Datadog Operator
+datadog/datadog-operator	1.1.0        	1.1.0      	Datadog Operator
 ```
 
 Then you will need to install the cert manager if you don't have it already, add the chart:
@@ -120,7 +121,7 @@ You can update with the following:
 ```
 helm upgrade \
     datadog-operator datadog/datadog-operator \
-    --set image.tag=1.0.3 \
+    --set image.tag=1.4.0 \
     --set datadogCRDs.migration.datadogAgents.version=v2alpha1 \
     --set datadogCRDs.migration.datadogAgents.useCertManager=true \
     --set datadogCRDs.migration.datadogAgents.conversionWebhook.enabled=true

charts/datadog-operator/README.md.gotmpl

@@ -46,7 +46,7 @@ and for the Datadog Operator chart:
 
 ```
 NAME                    	CHART VERSION	APP VERSION	DESCRIPTION
-datadog/datadog-operator	1.0.4        	1.0.3      	Datadog Operator
+datadog/datadog-operator	1.1.0        	1.1.0      	Datadog Operator
 ```
 
 Then you will need to install the cert manager if you don't have it already, add the chart:
@@ -68,7 +68,7 @@ You can update with the following:
 ```
 helm upgrade \
     datadog-operator datadog/datadog-operator \
-    --set image.tag=1.0.3 \
+    --set image.tag=1.4.0 \
     --set datadogCRDs.migration.datadogAgents.version=v2alpha1 \
     --set datadogCRDs.migration.datadogAgents.useCertManager=true \
     --set datadogCRDs.migration.datadogAgents.conversionWebhook.enabled=true

charts/datadog-operator/templates/deployment.yaml

@@ -107,6 +107,9 @@ spec:
           {{- end }}
           {{- if and .Values.maximumGoroutines (semverCompare ">=1.0.0-rc.13" .Values.image.tag) }}
             - "-maximumGoroutines={{ .Values.maximumGoroutines }}"
+          {{- end }}
+          {{- if (semverCompare ">=1.4.0" .Values.image.tag) }}
+            - "-introspectionEnabled={{ .Values.introspection.enabled }}"
           {{- end }}
             - "-datadogMonitorEnabled={{ .Values.datadogMonitor.enabled }}"
           {{- if (semverCompare ">=1.0.0-rc.13" .Values.image.tag) }}

charts/datadog-operator/values.yaml

@@ -43,7 +43,7 @@ image:
   # image.repository -- Repository to use for Datadog Operator image
   repository: 709825985650.dkr.ecr.us-east-1.amazonaws.com/datadog/operator
   # image.tag -- Define the Datadog Operator version to use
-  tag: 1.3.0
+  tag: 1.4.0
   # image.pullPolicy -- Define the pullPolicy for Datadog Operator image
   pullPolicy: IfNotPresent
 # imagePullSecrets -- Datadog Operator repository pullSecret (ex: specify docker registry credentials)
@@ -56,10 +56,17 @@ fullnameOverride: ""
 logLevel: "info"
 # maximumGoroutines -- Override default goroutines threshold for the health check failure.
 maximumGoroutines:
+
+
+introspection:
+# introspection.enabled -- If true, enables introspection feature (beta). Requires v1.4.0+
+  enabled: false
 # supportExtendedDaemonset -- If true, supports using ExtendedDaemonSet CRD
 supportExtendedDaemonset: "false"
+
+# not enabled in addon
 # operatorMetricsEnabled -- Enable forwarding of Datadog Operator metrics and events to Datadog.
-operatorMetricsEnabled: "true"
+operatorMetricsEnabled: "false"
 # metricsPort -- Port used for OpenMetrics endpoint
 metricsPort: 8383
 secretBackend:

charts/operator-eks-addon/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: datadog-operator
   repository: file://../datadog-operator/
-  version: 1.4.1
-digest: sha256:cf346037c0594699f758d7fa5b6756fd341d21518d9c296f8dad6f5780ded173
-generated: "2024-01-05T16:34:41.687972-05:00"
+  version: 1.5.1
+digest: sha256:373ddf35571aab3ae1a3b559a2bd6fcb2ed55fcb9a5c8e6118e029e4759d182d
+generated: "2024-03-13T21:13:17.627503-04:00"

charts/operator-eks-addon/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: operator-eks-addon
-version: 0.1.6
+version: 0.1.7
 appVersion: 0.1.0
 description: Datadog Operator Wrapper
 home: https://www.datadoghq.com
@@ -10,6 +10,6 @@ maintainers:
   email: support@datadoghq.com
 dependencies:
 - name: datadog-operator
-  version: "=1.4.1"
+  version: "=1.5.1"
   alias: datadog-operator
   repository: file://../datadog-operator/

charts/operator-eks-addon/README.md

@@ -7,6 +7,7 @@ This is a wrapper chart for installing EKS add-on. Charts required for the add-o
 | - | - | - | - | - | - |
 | < 0.1.6 | 1.0.5 | 1.0.1 | 1.0.3 | 7.43.1 | 7.43.1 | 
 | 0.1.6 | 1.4.1 | 1.3.0 | 1.3.0 | 7.47.1 | 7.47.1 |
+| 0.1.7 | 1.5.1 | 1.4.0 | 1.4.0 | 7.50.3 | 7.50.3 |
 
 ## Pushing Add-on Chart
 Below steps have been validated using `Helm v3.12.0`.

test/datadog-operator/baseline/Operator_Deployment_default.yaml

@@ -7,9 +7,9 @@ metadata:
   namespace: datadog-agent
   labels:
     app.kubernetes.io/name: datadog-operator
-    helm.sh/chart: datadog-operator-1.4.1
+    helm.sh/chart: datadog-operator-1.5.1
     app.kubernetes.io/instance: datadog-operator
-    app.kubernetes.io/version: "1.3.0"
+    app.kubernetes.io/version: "1.4.0"
     app.kubernetes.io/managed-by: eks-addon
 spec:
   replicas: 1
@@ -35,7 +35,7 @@ spec:
       serviceAccountName: datadog-operator
       containers:
         - name: datadog-operator
-          image: "709825985650.dkr.ecr.us-east-1.amazonaws.com/datadog/operator:1.3.0"
+          image: "709825985650.dkr.ecr.us-east-1.amazonaws.com/datadog/operator:1.4.0"
           imagePullPolicy: IfNotPresent
           env:
             - name: WATCH_NAMESPACE
@@ -51,8 +51,9 @@ spec:
             - "-logEncoder=json"
             - "-metrics-addr=:8383"
             - "-loglevel=info"
-            - "-operatorMetricsEnabled=true"
+            - "-operatorMetricsEnabled=false"
             - "-webhookEnabled=false"
+            - "-introspectionEnabled=false"
             - "-datadogMonitorEnabled=false"
             - "-datadogAgentEnabled=true"
             - "-datadogSLOEnabled=false"

test/datadog-operator/operator_deployment_test.go

@@ -116,7 +116,7 @@ func verifyDeployment(t *testing.T, manifest string) {
 	assert.Equal(t, 1, len(deployment.Spec.Template.Spec.Containers))
 	operatorContainer := deployment.Spec.Template.Spec.Containers[0]
 	assert.Equal(t, v1.PullPolicy("IfNotPresent"), operatorContainer.ImagePullPolicy)
-	assert.Equal(t, "709825985650.dkr.ecr.us-east-1.amazonaws.com/datadog/operator:1.3.0", operatorContainer.Image)
+	assert.Equal(t, "709825985650.dkr.ecr.us-east-1.amazonaws.com/datadog/operator:1.4.0", operatorContainer.Image)
 	assert.Contains(t, operatorContainer.Args, "-webhookEnabled=false")
 }