From 9a22ba74db54e5a3cf93dc387578f3971f1ac200 Mon Sep 17 00:00:00 2001
From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>
Date: Fri, 1 Nov 2024 15:40:15 -0600
Subject: [PATCH] make crds

---
 .../conf/crds/crd-opentelemetrycollector.yaml       | 10 +++++++---
 .../conf/crds/crd-opentelemetryinstrumentation.yaml | 13 +++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml b/charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml
index 594e0f4ae..3922641a9 100644
--- a/charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml
+++ b/charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml
@@ -1,8 +1,9 @@
+{{- if .Values.crds.create }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: opentelemetry-operator-system/opentelemetry-operator-serving-cert
+    cert-manager.io/inject-ca-from: {{ include "opentelemetry-operator.webhookCertAnnotation" . }}
     controller-gen.kubebuilder.io/version: v0.16.1
   creationTimestamp: null
   labels:
@@ -14,9 +15,11 @@ spec:
     webhook:
       clientConfig:
         service:
-          name: opentelemetry-operator-webhook-service
-          namespace: opentelemetry-operator-system
+          name: {{ template "opentelemetry-operator.fullname" . }}-webhook
+          namespace: {{ .Release.Namespace }}
           path: /convert
+          port: {{ .Values.admissionWebhooks.servicePort }}
+{{ if .caBundle }}{{ cat "caBundle:" .caBundle | indent 8 }}{{ end }}
       conversionReviewVersions:
       - v1alpha1
       - v1beta1
@@ -9234,3 +9237,4 @@ status:
     plural: ""
   conditions: null
   storedVersions: null
+{{- end }}
diff --git a/charts/opentelemetry-operator/conf/crds/crd-opentelemetryinstrumentation.yaml b/charts/opentelemetry-operator/conf/crds/crd-opentelemetryinstrumentation.yaml
index 580c0f96b..70f57e656 100644
--- a/charts/opentelemetry-operator/conf/crds/crd-opentelemetryinstrumentation.yaml
+++ b/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: