Skip to content

Commit

Permalink
update datadog operator version to 1.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@swang392
swang392 committed Feb 6, 2025
1 parent c65f224 commit 66f95a2
Show file tree
Hide file tree
Showing 10 changed files with 160 additions and 15 deletions.
4 changes: 4 additions & 0 deletions charts/datadog-operator/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 2.6.0

* Update Datadog Operator version to 1.12.0.

## 2.5.1

* Expose CRD-specific namespace watch configuration added in Operator 1.8.0 release.
Expand Down
6 changes: 3 additions & 3 deletions charts/datadog-operator/Chart.lock
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: datadog-crds
repository: https://helm.datadoghq.com
version: 2.3.0
digest: sha256:67db7e15aa50bde3e2e62273b71402d2e4302c71f13201c3646ee5865e236106
generated: "2024-12-18T14:19:32.327237+01:00"
version: 2.4.0
digest: sha256:4be7d56cd69615a080f3d5218f73b3ffa384861cf1bf27af945de132ef4ccfd2
generated: "2025-02-06T16:02:55.784214-05:00"
6 changes: 3 additions & 3 deletions charts/datadog-operator/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: datadog-operator
version: 2.5.2
appVersion: 1.11.1
version: 2.6.0
appVersion: 1.12.0
description: Datadog Operator
keywords:
- monitoring
Expand All @@ -17,7 +17,7 @@ maintainers:
email: support@datadoghq.com
dependencies:
- name: datadog-crds
version: "=2.3.0"
version: "=2.4.0"
alias: datadogCRDs
repository: https://helm.datadoghq.com
condition: installCRDs
Expand Down
4 changes: 2 additions & 2 deletions charts/datadog-operator/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Datadog Operator

![Version: 2.5.2](https://img.shields.io/badge/Version-2.5.2-informational?style=flat-square) ![AppVersion: 1.11.1](https://img.shields.io/badge/AppVersion-1.11.1-informational?style=flat-square)
![Version: 2.6.0](https://img.shields.io/badge/Version-2.6.0-informational?style=flat-square) ![AppVersion: 1.12.0](https://img.shields.io/badge/AppVersion-1.12.0-informational?style=flat-square)

## Values

Expand Down Expand Up @@ -33,7 +33,7 @@
| image.doNotCheckTag | bool | `false` | Permit skipping operator image tag compatibility with the chart. |
| image.pullPolicy | string | `"IfNotPresent"` | Define the pullPolicy for Datadog Operator image |
| image.repository | string | `"gcr.io/datadoghq/operator"` | Repository to use for Datadog Operator image |
| image.tag | string | `"1.11.1"` | Define the Datadog Operator version to use |
| image.tag | string | `"1.12.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+ |
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog-operator/templates/_helpers.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,6 @@ Check operator image tag version.
{{- if not .Values.image.doNotCheckTag -}}
{{- .Values.image.tag -}}
{{- else -}}
{{ "1.11.1" }}
{{ "1.12.0" }}
{{- end -}}
{{- end -}}
3 changes: 3 additions & 0 deletions charts/datadog-operator/templates/clusterrole.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,8 @@ rules:
resources:
- datadogagents
- datadogagents/finalizers
- datadoggenericresources
- datadoggenericresources/finalizers
- datadogmonitors
- datadogmonitors/finalizers
- datadogslos
Expand All @@ -243,6 +245,7 @@ rules:
- datadoghq.com
resources:
- datadogagents/status
- datadoggenericresources/status
- datadogmonitors/status
- datadogslos/status
verbs:
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog-operator/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ image:
# image.repository -- Repository to use for Datadog Operator image
repository: gcr.io/datadoghq/operator
# image.tag -- Define the Datadog Operator version to use
tag: 1.11.1
tag: 1.12.0
# image.pullPolicy -- Define the pullPolicy for Datadog Operator image
pullPolicy: IfNotPresent
# image.doNotCheckTag -- Permit skipping operator image tag compatibility with the chart.
Expand Down
140 changes: 139 additions & 1 deletion test/datadog-operator/baseline/DatadogAgent_CRD_default.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
controller-gen.kubebuilder.io/version: v0.16.3
name: datadogagents.datadoghq.com
labels:
helm.sh/chart: 'datadogCRDs-2.3.0'
helm.sh/chart: 'datadogCRDs-2.4.0'
app.kubernetes.io/managed-by: 'Helm'
app.kubernetes.io/name: 'datadogCRDs'
app.kubernetes.io/instance: 'datadog-operator'
Expand Down Expand Up @@ -261,6 +261,11 @@ spec:
type: boolean
failurePolicy:
type: string
kubernetesAdmissionEvents:
properties:
enabled:
type: boolean
type: object
mutateUnlabelled:
type: boolean
mutation:
Expand Down Expand Up @@ -708,6 +713,69 @@ spec:
scrubContainers:
type: boolean
type: object
otelCollector:
properties:
conf:
properties:
configData:
type: string
configMap:
properties:
items:
items:
properties:
key:
type: string
mode:
format: int32
type: integer
path:
type: string
required:
- key
- path
type: object
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
name:
type: string
type: object
type: object
coreConfig:
properties:
enabled:
type: boolean
extensionTimeout:
type: integer
extensionURL:
type: string
type: object
enabled:
type: boolean
ports:
items:
properties:
containerPort:
format: int32
type: integer
hostIP:
type: string
hostPort:
format: int32
type: integer
name:
type: string
protocol:
default: TCP
type: string
required:
- containerPort
type: object
type: array
x-kubernetes-list-type: atomic
type: object
otlp:
properties:
receiver:
Expand Down Expand Up @@ -2444,6 +2512,8 @@ spec:
replicas:
format: int32
type: integer
runtimeClassName:
type: string
securityContext:
properties:
appArmorProfile:
Expand Down Expand Up @@ -3741,6 +3811,11 @@ spec:
type: boolean
failurePolicy:
type: string
kubernetesAdmissionEvents:
properties:
enabled:
type: boolean
type: object
mutateUnlabelled:
type: boolean
mutation:
Expand Down Expand Up @@ -4188,6 +4263,69 @@ spec:
scrubContainers:
type: boolean
type: object
otelCollector:
properties:
conf:
properties:
configData:
type: string
configMap:
properties:
items:
items:
properties:
key:
type: string
mode:
format: int32
type: integer
path:
type: string
required:
- key
- path
type: object
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
name:
type: string
type: object
type: object
coreConfig:
properties:
enabled:
type: boolean
extensionTimeout:
type: integer
extensionURL:
type: string
type: object
enabled:
type: boolean
ports:
items:
properties:
containerPort:
format: int32
type: integer
hostIP:
type: string
hostPort:
format: int32
type: integer
name:
type: string
protocol:
default: TCP
type: string
required:
- containerPort
type: object
type: array
x-kubernetes-list-type: atomic
type: object
otlp:
properties:
receiver:
Expand Down
6 changes: 3 additions & 3 deletions test/datadog-operator/baseline/Operator_Deployment_default.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ metadata:
namespace: datadog-agent
labels:
app.kubernetes.io/name: datadog-operator
helm.sh/chart: datadog-operator-2.5.1
helm.sh/chart: datadog-operator-2.6.0
app.kubernetes.io/instance: datadog-operator
app.kubernetes.io/version: "1.11.1"
app.kubernetes.io/version: "1.12.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -35,7 +35,7 @@ spec:
serviceAccountName: datadog-operator
containers:
- name: datadog-operator
image: "gcr.io/datadoghq/operator:1.11.1"
image: "gcr.io/datadoghq/operator:1.12.0"
imagePullPolicy: IfNotPresent
env:
- name: WATCH_NAMESPACE
Expand Down
2 changes: 1 addition & 1 deletion test/datadog-operator/operator_deployment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,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, "gcr.io/datadoghq/operator:1.11.1", operatorContainer.Image)
assert.Equal(t, "gcr.io/datadoghq/operator:1.12.0", operatorContainer.Image)
assert.NotContains(t, operatorContainer.Args, "-webhookEnabled=false")
assert.NotContains(t, operatorContainer.Args, "-webhookEnabled=true")
}
Expand Down

0 comments on commit 66f95a2

Please sign in to comment.