Merge branch 'main' into demo-flgad-ui

Makefile

@@ -71,9 +71,6 @@ check-operator-crds:
 	$(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}; \
@@ -91,5 +88,7 @@ define get-crd
 @sed -i 's/opentelemetry-operator-webhook-service/{{ template "opentelemetry-operator.fullname" . }}-webhook/g' $(1)
 @sed -i '1s/^/{{- if .Values.crds.create }}\n/' $(1)
 @sed -i 's#\(.*\)path: /convert#&\n\1port: {{ .Values.admissionWebhooks.servicePort }}#' $(1)
+@sed -i 's#\(.*\)conversion:#{{- if .Values.admissionWebhooks.create }}\n&#' $(1)
+@sed -i 's#\(.*\)- v1beta1#&\n{{- end }}#' $(1)
 @echo '{{- end }}' >> $(1)
 endef

charts/opentelemetry-operator/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-operator
-version: 0.71.2
+version: 0.72.0
 description: OpenTelemetry Operator Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/
@@ -12,4 +12,4 @@ maintainers:
   - name: jaronoff97
   - name: TylerHelmuth
 icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png
-appVersion: 0.110.0
+appVersion: 0.111.0

charts/opentelemetry-operator/conf/crds/crd-opentelemetryinstrumentation.yaml

@@ -410,6 +410,19 @@ spec:
                 properties:
                   endpoint:
                     type: string
+                  tls:
+                    properties:
+                      ca_file:
+                        type: string
+                      cert_file:
+                        type: string
+                      configMapName:
+                        type: string
+                      key_file:
+                        type: string
+                      secretName:
+                        type: string
+                    type: object
                 type: object
               go:
                 properties:

charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml

@@ -6,9 +6,9 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.71.2
+    helm.sh/chart: opentelemetry-operator-0.72.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.111.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
 
@@ -91,9 +91,9 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.71.2
+    helm.sh/chart: opentelemetry-operator-0.72.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.111.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
 

charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook.yaml

@@ -11417,6 +11417,19 @@ spec:
                 properties:
                   endpoint:
                     type: string
+                  tls:
+                    properties:
+                      ca_file:
+                        type: string
+                      cert_file:
+                        type: string
+                      configMapName:
+                        type: string
+                      key_file:
+                        type: string
+                      secretName:
+                        type: string
+                    type: object
                 type: object
               go:
                 properties:

charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml

@@ -4,9 +4,9 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.71.2
+    helm.sh/chart: opentelemetry-operator-0.72.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.111.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
 
@@ -30,9 +30,9 @@ apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.71.2
+    helm.sh/chart: opentelemetry-operator-0.72.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.111.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
 

charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml

@@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.71.2
+    helm.sh/chart: opentelemetry-operator-0.72.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.111.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
 
@@ -223,9 +223,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.71.2
+    helm.sh/chart: opentelemetry-operator-0.72.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.111.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
 
@@ -242,9 +242,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.71.2
+    helm.sh/chart: opentelemetry-operator-0.72.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.111.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
 

charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml

@@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.71.2
+    helm.sh/chart: opentelemetry-operator-0.72.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.111.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
 
@@ -26,9 +26,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.71.2
+    helm.sh/chart: opentelemetry-operator-0.72.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.111.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
 

charts/opentelemetry-operator/examples/default/rendered/deployment.yaml

@@ -4,9 +4,9 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.71.2
+    helm.sh/chart: opentelemetry-operator-0.72.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.111.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
 
@@ -34,13 +34,13 @@ spec:
             - --enable-leader-election
             - --health-probe-addr=:8081
             - --webhook-port=9443
-            - --collector-image=otel/opentelemetry-collector-k8s:0.110.0
+            - --collector-image=otel/opentelemetry-collector-k8s:0.111.0
           command:
             - /manager
           env:
             - name: ENABLE_WEBHOOKS
               value: "true"
-          image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.110.0"
+          image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.111.0"
           name: manager
           ports:
             - containerPort: 8080

charts/opentelemetry-operator/examples/default/rendered/role.yaml

@@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.71.2
+    helm.sh/chart: opentelemetry-operator-0.72.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.111.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
 

charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml

@@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.71.2
+    helm.sh/chart: opentelemetry-operator-0.72.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.111.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
 

charts/opentelemetry-operator/examples/default/rendered/service.yaml

@@ -4,9 +4,9 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.71.2
+    helm.sh/chart: opentelemetry-operator-0.72.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.111.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
 
@@ -32,9 +32,9 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.71.2
+    helm.sh/chart: opentelemetry-operator-0.72.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.111.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
 

charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml

@@ -6,9 +6,9 @@ metadata:
   name: opentelemetry-operator
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.71.2
+    helm.sh/chart: opentelemetry-operator-0.72.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.111.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
 

charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml

@@ -6,9 +6,9 @@ metadata:
   name: "example-opentelemetry-operator-cert-manager"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.71.2
+    helm.sh/chart: opentelemetry-operator-0.72.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.111.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
 

charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml

@@ -6,9 +6,9 @@ metadata:
   name: "example-opentelemetry-operator-metrics"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.71.2
+    helm.sh/chart: opentelemetry-operator-0.72.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.111.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
 
@@ -44,9 +44,9 @@ metadata:
   name: "example-opentelemetry-operator-webhook"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.71.2
+    helm.sh/chart: opentelemetry-operator-0.72.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.111.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
 

charts/opentelemetry-operator/templates/NOTES.txt

@@ -3,6 +3,6 @@
 {{ end }}
 
 {{ $.Chart.Name }} has been installed. Check its status by running:
-  kubectl --namespace {{ .Release.Namespace }} get pods -l "release={{ $.Release.Name }}"
+  kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/name={{ $.Release.Name }}"
 
 Visit https://github.com/open-telemetry/opentelemetry-operator for instructions on how to create & configure OpenTelemetryCollector and Instrumentation custom resources by using the Operator.

charts/opentelemetry-operator/values.yaml

@@ -42,7 +42,7 @@ manager:
     tag: ""
   collectorImage:
     repository: ""
-    tag: 0.110.0
+    tag: 0.111.0
   opampBridgeImage:
     repository: ""
     tag: ""