Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update operator version to 1.10.0 #1603

Merged
merged 1 commit into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions charts/datadog-operator/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 2.3.0

* Update Datadog Operator version to 1.10.0.

## 2.2.0

* Add clusterRole.allowReadAllResources to allow viewing all resources. This is required for collecting custom resources in the Kubernetes Explorer
Expand Down
6 changes: 3 additions & 3 deletions charts/datadog-operator/Chart.lock
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.1.0
digest: sha256:8f24ab33303f20421688b071b9fb028c0662795952298300ed4b9a060a4332ac
generated: "2024-10-10T12:48:27.526346-04:00"
version: 2.2.0
digest: sha256:42b9b7296f565f17f11adea26fa8cb003c0f01551a84793873a3ae6c73efedc2
generated: "2024-11-08T14:03:54.721912-05:00"
6 changes: 3 additions & 3 deletions charts/datadog-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: datadog-operator
version: 2.2.0
appVersion: 1.9.0
version: 2.3.0
appVersion: 1.10.0
description: Datadog Operator
keywords:
- monitoring
Expand All @@ -17,7 +17,7 @@ maintainers:
email: support@datadoghq.com
dependencies:
- name: datadog-crds
version: "=2.1.0"
version: "=2.2.0"
alias: datadogCRDs
repository: https://helm.datadoghq.com
condition: installCRDs
Expand Down
4 changes: 2 additions & 2 deletions charts/datadog-operator/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Datadog Operator

![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![AppVersion: 1.9.0](https://img.shields.io/badge/AppVersion-1.9.0-informational?style=flat-square)
![Version: 2.3.0](https://img.shields.io/badge/Version-2.3.0-informational?style=flat-square) ![AppVersion: 1.10.0](https://img.shields.io/badge/AppVersion-1.10.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.9.0"` | Define the Datadog Operator version to use |
| image.tag | string | `"1.10.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
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.9.0" }}
{{ "1.10.0" }}
{{- end -}}
{{- end -}}
2 changes: 1 addition & 1 deletion charts/datadog-operator/values.yaml
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.9.0
tag: 1.10.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
165 changes: 164 additions & 1 deletion test/datadog-operator/baseline/DatadogAgent_CRD_default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
controller-gen.kubebuilder.io/version: v0.14.0
name: datadogagents.datadoghq.com
labels:
helm.sh/chart: 'datadogCRDs-2.1.0'
helm.sh/chart: 'datadogCRDs-2.2.0'
app.kubernetes.io/managed-by: 'Helm'
app.kubernetes.io/name: 'datadogCRDs'
app.kubernetes.io/instance: 'datadog-operator'
Expand Down Expand Up @@ -701,13 +701,29 @@ spec:
type: boolean
endpoint:
type: string
hostPortConfig:
properties:
enabled:
type: boolean
hostPort:
format: int32
type: integer
type: object
type: object
http:
properties:
enabled:
type: boolean
endpoint:
type: string
hostPortConfig:
properties:
enabled:
type: boolean
hostPort:
format: int32
type: integer
type: object
type: object
type: object
type: object
Expand Down Expand Up @@ -851,6 +867,73 @@ spec:
url:
type: string
type: object
env:
items:
properties:
name:
type: string
value:
type: string
valueFrom:
properties:
configMapKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
fieldRef:
properties:
apiVersion:
type: string
fieldPath:
type: string
required:
- fieldPath
type: object
x-kubernetes-map-type: atomic
resourceFieldRef:
properties:
containerName:
type: string
divisor:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
resource:
type: string
required:
- resource
type: object
x-kubernetes-map-type: atomic
secretKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
fips:
properties:
customFIPSConfig:
Expand Down Expand Up @@ -1006,6 +1089,18 @@ spec:
tlsVerify:
type: boolean
type: object
kubernetesResourcesAnnotationsAsTags:
additionalProperties:
additionalProperties:
type: string
type: object
type: object
kubernetesResourcesLabelsAsTags:
additionalProperties:
additionalProperties:
type: string
type: object
type: object
localService:
properties:
forceEnableLocalService:
Expand Down Expand Up @@ -1076,6 +1171,31 @@ spec:
type: object
registry:
type: string
secretBackend:
properties:
args:
type: string
command:
type: string
enableGlobalPermissions:
type: boolean
roles:
items:
properties:
namespace:
type: string
secrets:
items:
type: string
type: array
x-kubernetes-list-type: set
type: object
type: array
x-kubernetes-list-type: atomic
timeout:
format: int32
type: integer
type: object
site:
type: string
tags:
Expand Down Expand Up @@ -1975,6 +2095,29 @@ spec:
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
envFrom:
items:
properties:
configMapRef:
properties:
name:
type: string
optional:
type: boolean
type: object
x-kubernetes-map-type: atomic
prefix:
type: string
secretRef:
properties:
name:
type: string
optional:
type: boolean
type: object
x-kubernetes-map-type: atomic
type: object
type: array
extraChecksd:
properties:
configDataMap:
Expand Down Expand Up @@ -2137,6 +2280,10 @@ spec:
type: string
type: object
type: object
serviceAccountAnnotations:
additionalProperties:
type: string
type: object
serviceAccountName:
type: string
tolerations:
Expand Down Expand Up @@ -3723,13 +3870,29 @@ spec:
type: boolean
endpoint:
type: string
hostPortConfig:
properties:
enabled:
type: boolean
hostPort:
format: int32
type: integer
type: object
type: object
http:
properties:
enabled:
type: boolean
endpoint:
type: string
hostPortConfig:
properties:
enabled:
type: boolean
hostPort:
format: int32
type: integer
type: object
type: object
type: object
type: object
Expand Down
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.2.0
helm.sh/chart: datadog-operator-2.3.0
app.kubernetes.io/instance: datadog-operator
app.kubernetes.io/version: "1.9.0"
app.kubernetes.io/version: "1.10.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.9.0"
image: "gcr.io/datadoghq/operator:1.10.0"
imagePullPolicy: IfNotPresent
env:
- name: WATCH_NAMESPACE
Expand Down
2 changes: 1 addition & 1 deletion test/datadog-operator/operator_deployment_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,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.9.0", operatorContainer.Image)
assert.Equal(t, "gcr.io/datadoghq/operator:1.10.0", operatorContainer.Image)
assert.NotContains(t, operatorContainer.Args, "-webhookEnabled=false")
assert.NotContains(t, operatorContainer.Args, "-webhookEnabled=true")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:

name: datadog-clusterchecks
annotations:
checksum/clusteragent_token: 12bf793564e44ccbda0cb741eff765654dd1f980807df8c9e1c48fa5843f977f
checksum/clusteragent_token: 469c53bc0541e25237e65b1972c755bf51ba2a3faff0db4200a5e616c1a85ae6
checksum/install_info: 8e66003a020dd0b648cc0ee91a46e96257f348938a3e1a58fd54ea6f86adbd5e
spec:
serviceAccountName: datadog-cluster-checks
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:

name: datadog-cluster-agent
annotations:
checksum/clusteragent_token: 0bdd826ca5a082af0fb3b706904748841535d6e49e5c19fa1c1927e46e2be582
checksum/clusteragent_token: 050ab49a451e1238668b8df86b20941fe655e87b3a55aa57497dea39ac9163c5
checksum/clusteragent-configmap: 6fea41ac9179f9a526bbb2b5c3f168fd232111ff2c4bdf1cd922c31e45038c31
checksum/api_key: 5aa9dfe916543cbcf1014dfa812cc46d36156564f56704b12c5f9e9c77afd266
checksum/application_key: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:

name: datadog-cluster-agent
annotations:
checksum/clusteragent_token: d767ed339a25dd96716bdb33b78df8bea9dea12ab0e51a9421565ffd7c52d4c0
checksum/clusteragent_token: 6723707eea64584b2ca85a11cd177a99c2fe52117542bffbdf61a38592a0b2a5
checksum/clusteragent-configmap: 6fea41ac9179f9a526bbb2b5c3f168fd232111ff2c4bdf1cd922c31e45038c31
checksum/api_key: 5aa9dfe916543cbcf1014dfa812cc46d36156564f56704b12c5f9e9c77afd266
checksum/application_key: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:

name: datadog-cluster-agent
annotations:
checksum/clusteragent_token: 4682112f5ddc3bb51df45fdecab40e75d8b78b7b0833a7ebddf16ab19ebd6c79
checksum/clusteragent_token: 7d36a45b80acd6890bafa74cae91697ea7b85a2561cc27f38148d00607a734b4
checksum/clusteragent-configmap: 6fea41ac9179f9a526bbb2b5c3f168fd232111ff2c4bdf1cd922c31e45038c31
checksum/api_key: 5aa9dfe916543cbcf1014dfa812cc46d36156564f56704b12c5f9e9c77afd266
checksum/application_key: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
Expand Down
2 changes: 1 addition & 1 deletion test/datadog/baseline/daemonset_default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:

name: datadog
annotations:
checksum/clusteragent_token: 762520458d6f8835baa01ed6151bb362d62ec396986f8d899953f5e024eee49f
checksum/clusteragent_token: 36783249a1a56e6ad7e24b5b38037b6fa09535bcbf5d09bfa9ae9d87be97990e
checksum/install_info: 8e66003a020dd0b648cc0ee91a46e96257f348938a3e1a58fd54ea6f86adbd5e
checksum/autoconf-config: 74234e98afe7498fb5daf1f36ac2d78acc339464f950703b8c019892f982b90b
checksum/confd-config: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
Expand Down
Loading
Loading