diff --git a/Makefile b/Makefile index bca0ca837..738a3b096 100644 --- a/Makefile +++ b/Makefile @@ -70,6 +70,10 @@ check-operator-crds: $(call get-crd,${TMP_DIRECTORY}/crds/crd-opentelemetrycollector.yaml,https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$(OPERATOR_APP_VERSION)/bundle/community/manifests/opentelemetry.io_opentelemetrycollectors.yaml) $(call get-crd,${TMP_DIRECTORY}/crds/crd-opentelemetryinstrumentation.yaml,https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$(OPERATOR_APP_VERSION)/bundle/community/manifests/opentelemetry.io_instrumentations.yaml) $(call get-crd,${TMP_DIRECTORY}/crds/crd-opentelemetry.io_opampbridges.yaml,https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$(OPERATOR_APP_VERSION)/bundle/community/manifests/opentelemetry.io_opampbridges.yaml) + + @sed -i '/{{- if \.Values\.admissionWebhooks\.create }}/d' "./charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml" + @sed -i '0,/{{- end }}/{/{{- end }}/d}' "./charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml" + if diff ${TMP_DIRECTORY}/crds ./charts/opentelemetry-operator/conf/crds > /dev/null; then \ echo "Passed"; \ rm -rf ${TMP_DIRECTORY}; \ diff --git a/charts/opentelemetry-operator/Chart.yaml b/charts/opentelemetry-operator/Chart.yaml index 734a76002..f3cd1c3a6 100644 --- a/charts/opentelemetry-operator/Chart.yaml +++ b/charts/opentelemetry-operator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-operator -version: 0.71.0 +version: 0.71.1 description: OpenTelemetry Operator Helm chart for Kubernetes type: application home: https://opentelemetry.io/ diff --git a/charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml b/charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml index 3922641a9..95d16b8b4 100644 --- a/charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml +++ b/charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml @@ -10,6 +10,7 @@ metadata: app.kubernetes.io/name: opentelemetry-operator name: opentelemetrycollectors.opentelemetry.io spec: +{{- if .Values.admissionWebhooks.create }} conversion: strategy: Webhook webhook: @@ -23,6 +24,7 @@ spec: conversionReviewVersions: - v1alpha1 - v1beta1 +{{- end }} group: opentelemetry.io names: kind: OpenTelemetryCollector diff --git a/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml b/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml index 8f1d1f68f..6d1e0d9fe 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml +++ b/charts/opentelemetry-operator/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.71.0 + helm.sh/chart: opentelemetry-operator-0.71.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm @@ -91,7 +91,7 @@ metadata: annotations: cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert labels: - helm.sh/chart: opentelemetry-operator-0.71.0 + helm.sh/chart: opentelemetry-operator-0.71.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.110.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 index 48480ff81..387939c17 100644 --- 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.71.0 + helm.sh/chart: opentelemetry-operator-0.71.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm @@ -30,7 +30,7 @@ apiVersion: cert-manager.io/v1 kind: Issuer metadata: labels: - helm.sh/chart: opentelemetry-operator-0.71.0 + helm.sh/chart: opentelemetry-operator-0.71.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.110.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 index 560b2f722..6a2b86666 100644 --- 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.71.0 + helm.sh/chart: opentelemetry-operator-0.71.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm @@ -223,7 +223,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: opentelemetry-operator-0.71.0 + helm.sh/chart: opentelemetry-operator-0.71.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm @@ -242,7 +242,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: opentelemetry-operator-0.71.0 + helm.sh/chart: opentelemetry-operator-0.71.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.110.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 index 4b1a67b64..c6c314a74 100644 --- 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.71.0 + helm.sh/chart: opentelemetry-operator-0.71.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm @@ -26,7 +26,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - helm.sh/chart: opentelemetry-operator-0.71.0 + helm.sh/chart: opentelemetry-operator-0.71.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.110.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 index 96b47ca7a..b631aafbd 100644 --- 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.71.0 + helm.sh/chart: opentelemetry-operator-0.71.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.110.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 index 46acd4e8c..347ff79a4 100644 --- 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.71.0 + helm.sh/chart: opentelemetry-operator-0.71.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.110.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 index 49eee9047..43d9d25ab 100644 --- 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.71.0 + helm.sh/chart: opentelemetry-operator-0.71.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.110.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 index 195166d7c..1073fce0d 100644 --- 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.71.0 + helm.sh/chart: opentelemetry-operator-0.71.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm @@ -32,7 +32,7 @@ apiVersion: v1 kind: Service metadata: labels: - helm.sh/chart: opentelemetry-operator-0.71.0 + helm.sh/chart: opentelemetry-operator-0.71.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.110.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 index dcbfeb7a2..3d53ee952 100644 --- 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.71.0 + helm.sh/chart: opentelemetry-operator-0.71.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml b/charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml index d83094320..8e36b512e 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml +++ b/charts/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.71.0 + helm.sh/chart: opentelemetry-operator-0.71.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.110.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 index bae7e60e6..9e77139fa 100644 --- 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.71.0 + helm.sh/chart: opentelemetry-operator-0.71.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm @@ -44,7 +44,7 @@ metadata: name: "example-opentelemetry-operator-webhook" namespace: default labels: - helm.sh/chart: opentelemetry-operator-0.71.0 + helm.sh/chart: opentelemetry-operator-0.71.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.110.0" app.kubernetes.io/managed-by: Helm