[opentelemetry-operator] Add affinity, tolerations and nodeSelector t…

…o tests (#911) * Add affinity, tolerations and nodeSelector to tests * Change version from 0.40.0 to 0.39.2
open-telemetry · Oct 10, 2023 · 8a89af9 · 8a89af9
1 parent aa2e541
commit 8a89af9
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 19 deletions.
diff --git a/charts/opentelemetry-operator/Chart.yaml b/charts/opentelemetry-operator/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-operator
-version: 0.39.1
+version: 0.39.2
 description: OpenTelemetry Operator Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/

diff --git a/...ator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml b/...ator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.39.1
+    helm.sh/chart: opentelemetry-operator-0.39.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.85.0"
     app.kubernetes.io/managed-by: Helm
@@ -85,7 +85,7 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.39.1
+    helm.sh/chart: opentelemetry-operator-0.39.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.85.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml b/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml
@@ -4,7 +4,7 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.39.1
+    helm.sh/chart: opentelemetry-operator-0.39.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.85.0"
     app.kubernetes.io/managed-by: Helm
@@ -29,7 +29,7 @@ apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.39.1
+    helm.sh/chart: opentelemetry-operator-0.39.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.85.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml b/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.39.1
+    helm.sh/chart: opentelemetry-operator-0.39.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.85.0"
     app.kubernetes.io/managed-by: Helm
@@ -214,7 +214,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.39.1
+    helm.sh/chart: opentelemetry-operator-0.39.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.85.0"
     app.kubernetes.io/managed-by: Helm
@@ -232,7 +232,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.39.1
+    helm.sh/chart: opentelemetry-operator-0.39.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.85.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml b/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.39.1
+    helm.sh/chart: opentelemetry-operator-0.39.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.85.0"
     app.kubernetes.io/managed-by: Helm
@@ -25,7 +25,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.39.1
+    helm.sh/chart: opentelemetry-operator-0.39.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.85.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml b/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml
@@ -4,7 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.39.1
+    helm.sh/chart: opentelemetry-operator-0.39.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.85.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/role.yaml b/charts/opentelemetry-operator/examples/default/rendered/role.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.39.1
+    helm.sh/chart: opentelemetry-operator-0.39.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.85.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml b/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.39.1
+    helm.sh/chart: opentelemetry-operator-0.39.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.85.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/service.yaml b/charts/opentelemetry-operator/examples/default/rendered/service.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.39.1
+    helm.sh/chart: opentelemetry-operator-0.39.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.85.0"
     app.kubernetes.io/managed-by: Helm
@@ -31,7 +31,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.39.1
+    helm.sh/chart: opentelemetry-operator-0.39.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.85.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml
@@ -6,7 +6,7 @@ metadata:
   name: opentelemetry-operator
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.39.1
+    helm.sh/chart: opentelemetry-operator-0.39.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.85.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/...s/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml b/...s/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml
@@ -6,7 +6,7 @@ metadata:
   name: "example-opentelemetry-operator-cert-manager"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.39.1
+    helm.sh/chart: opentelemetry-operator-0.39.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.85.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml b/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml
@@ -6,7 +6,7 @@ metadata:
   name: "example-opentelemetry-operator-metrics"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.39.1
+    helm.sh/chart: opentelemetry-operator-0.39.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.85.0"
     app.kubernetes.io/managed-by: Helm
@@ -43,7 +43,7 @@ metadata:
   name: "example-opentelemetry-operator-webhook"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.39.1
+    helm.sh/chart: opentelemetry-operator-0.39.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.85.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/templates/tests/test-certmanager-connection.yaml b/charts/opentelemetry-operator/templates/tests/test-certmanager-connection.yaml
@@ -30,4 +30,13 @@ spec:
           else exit 1
           fi
   restartPolicy: Never
+  {{- with .Values.affinity }}
+  affinity: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.tolerations }}
+  tolerations: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.nodeSelector }}
+  nodeSelector: {{ toYaml . | nindent 4 }}
+  {{- end }}
 {{- end }}
diff --git a/charts/opentelemetry-operator/templates/tests/test-service-connection.yaml b/charts/opentelemetry-operator/templates/tests/test-service-connection.yaml
@@ -31,6 +31,15 @@ spec:
           else exit 1
           fi
   restartPolicy: Never
+  {{- with .Values.affinity }}
+  affinity: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.tolerations }}
+  tolerations: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.nodeSelector }}
+  nodeSelector: {{ toYaml . | nindent 4 }}
+  {{- end }}
 {{- end }}
 ---
 apiVersion: v1
@@ -64,3 +73,13 @@ spec:
           else exit 1
           fi
   restartPolicy: Never
+  {{- with .Values.affinity }}
+  affinity: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.tolerations }}
+  tolerations: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.nodeSelector }}
+  nodeSelector: {{ toYaml . | nindent 4 }}
+  {{- end }}
+