Potential fix for operator certmanager cert issue

jvoravong · Nov 12, 2024 · f0a080e · f0a080e
1 parent 7ea0cab
commit f0a080e
Show file tree

Hide file tree

Showing 24 changed files with 9,516 additions and 2,031 deletions.
diff --git a/...erator-and-auto-instrumentation/rendered_manifests/certmanager/cainjector-deployment.yaml b/...erator-and-auto-instrumentation/rendered_manifests/certmanager/cainjector-deployment.yaml
@@ -10,9 +10,9 @@ metadata:
     app.kubernetes.io/name: cainjector
     app.kubernetes.io/instance: default
     app.kubernetes.io/component: "cainjector"
-    app.kubernetes.io/version: "v1.14.4"
+    app.kubernetes.io/version: "v1.16.1"
     app.kubernetes.io/managed-by: Helm
-    helm.sh/chart: certmanager-v1.14.4
+    helm.sh/chart: certmanager-v1.16.1
 spec:
   replicas: 1
   selector:
@@ -27,9 +27,13 @@ spec:
         app.kubernetes.io/name: cainjector
         app.kubernetes.io/instance: default
         app.kubernetes.io/component: "cainjector"
-        app.kubernetes.io/version: "v1.14.4"
+        app.kubernetes.io/version: "v1.16.1"
         app.kubernetes.io/managed-by: Helm
-        helm.sh/chart: certmanager-v1.14.4
+        helm.sh/chart: certmanager-v1.16.1
+      annotations:
+        prometheus.io/path: "/metrics"
+        prometheus.io/scrape: 'true'
+        prometheus.io/port: '9402'
     spec:
       serviceAccountName: default-certmanager-cainjector
       enableServiceLinks: false
@@ -39,11 +43,15 @@ spec:
           type: RuntimeDefault
       containers:
         - name: certmanager-cainjector
-          image: "quay.io/jetstack/cert-manager-cainjector:v1.14.4"
+          image: "quay.io/jetstack/cert-manager-cainjector:v1.16.1"
           imagePullPolicy: IfNotPresent
           args:
           - --v=2
           - --leader-election-namespace=kube-system
+          ports:
+          - containerPort: 9402
+            name: http-metrics
+            protocol: TCP
           env:
           - name: POD_NAMESPACE
             valueFrom:

diff --git a/...ble-operator-and-auto-instrumentation/rendered_manifests/certmanager/cainjector-rbac.yaml b/...ble-operator-and-auto-instrumentation/rendered_manifests/certmanager/cainjector-rbac.yaml
@@ -9,9 +9,9 @@ metadata:
     app.kubernetes.io/name: cainjector
     app.kubernetes.io/instance: default
     app.kubernetes.io/component: "cainjector"
-    app.kubernetes.io/version: "v1.14.4"
+    app.kubernetes.io/version: "v1.16.1"
     app.kubernetes.io/managed-by: Helm
-    helm.sh/chart: certmanager-v1.14.4
+    helm.sh/chart: certmanager-v1.16.1
 rules:
   - apiGroups: ["cert-manager.io"]
     resources: ["certificates"]
@@ -42,9 +42,9 @@ metadata:
     app.kubernetes.io/name: cainjector
     app.kubernetes.io/instance: default
     app.kubernetes.io/component: "cainjector"
-    app.kubernetes.io/version: "v1.14.4"
+    app.kubernetes.io/version: "v1.16.1"
     app.kubernetes.io/managed-by: Helm
-    helm.sh/chart: certmanager-v1.14.4
+    helm.sh/chart: certmanager-v1.16.1
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -66,9 +66,9 @@ metadata:
     app.kubernetes.io/name: cainjector
     app.kubernetes.io/instance: default
     app.kubernetes.io/component: "cainjector"
-    app.kubernetes.io/version: "v1.14.4"
+    app.kubernetes.io/version: "v1.16.1"
     app.kubernetes.io/managed-by: Helm
-    helm.sh/chart: certmanager-v1.14.4
+    helm.sh/chart: certmanager-v1.16.1
 rules:
   # Used for leader election by the controller
   # cert-manager-cainjector-leader-election is used by the CertificateBased injector controller
@@ -96,9 +96,9 @@ metadata:
     app.kubernetes.io/name: cainjector
     app.kubernetes.io/instance: default
     app.kubernetes.io/component: "cainjector"
-    app.kubernetes.io/version: "v1.14.4"
+    app.kubernetes.io/version: "v1.16.1"
     app.kubernetes.io/managed-by: Helm
-    helm.sh/chart: certmanager-v1.14.4
+    helm.sh/chart: certmanager-v1.16.1
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/...-operator-and-auto-instrumentation/rendered_manifests/certmanager/cainjector-service.yaml b/...-operator-and-auto-instrumentation/rendered_manifests/certmanager/cainjector-service.yaml
@@ -0,0 +1,25 @@
+---
+# Source: splunk-otel-collector/charts/certmanager/templates/cainjector-service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: default-certmanager-cainjector
+  namespace: default
+  labels:
+    app: cainjector
+    app.kubernetes.io/name: cainjector
+    app.kubernetes.io/instance: default
+    app.kubernetes.io/component: "cainjector"
+    app.kubernetes.io/version: "v1.16.1"
+    app.kubernetes.io/managed-by: Helm
+    helm.sh/chart: certmanager-v1.16.1
+spec:
+  type: ClusterIP
+  ports:
+  - protocol: TCP
+    port: 9402
+    name: http-metrics
+  selector:
+    app.kubernetes.io/name: cainjector
+    app.kubernetes.io/instance: default
+    app.kubernetes.io/component: "cainjector"
diff --git a/...or-and-auto-instrumentation/rendered_manifests/certmanager/cainjector-serviceaccount.yaml b/...or-and-auto-instrumentation/rendered_manifests/certmanager/cainjector-serviceaccount.yaml
@@ -11,6 +11,6 @@ metadata:
     app.kubernetes.io/name: cainjector
     app.kubernetes.io/instance: default
     app.kubernetes.io/component: "cainjector"
-    app.kubernetes.io/version: "v1.14.4"
+    app.kubernetes.io/version: "v1.16.1"
     app.kubernetes.io/managed-by: Helm
-    helm.sh/chart: certmanager-v1.14.4
+    helm.sh/chart: certmanager-v1.16.1
diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/certmanager/crds.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/certmanager/crds.yaml
diff --git a/...s/enable-operator-and-auto-instrumentation/rendered_manifests/certmanager/deployment.yaml b/...s/enable-operator-and-auto-instrumentation/rendered_manifests/certmanager/deployment.yaml
@@ -10,9 +10,9 @@ metadata:
     app.kubernetes.io/name: certmanager
     app.kubernetes.io/instance: default
     app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.14.4"
+    app.kubernetes.io/version: "v1.16.1"
     app.kubernetes.io/managed-by: Helm
-    helm.sh/chart: certmanager-v1.14.4
+    helm.sh/chart: certmanager-v1.16.1
 spec:
   replicas: 1
   selector:
@@ -27,9 +27,9 @@ spec:
         app.kubernetes.io/name: certmanager
         app.kubernetes.io/instance: default
         app.kubernetes.io/component: "controller"
-        app.kubernetes.io/version: "v1.14.4"
+        app.kubernetes.io/version: "v1.16.1"
         app.kubernetes.io/managed-by: Helm
-        helm.sh/chart: certmanager-v1.14.4
+        helm.sh/chart: certmanager-v1.16.1
       annotations:
         prometheus.io/path: "/metrics"
         prometheus.io/scrape: 'true'
@@ -43,13 +43,13 @@ spec:
           type: RuntimeDefault
       containers:
         - name: certmanager-controller
-          image: "quay.io/jetstack/cert-manager-controller:v1.14.4"
+          image: "quay.io/jetstack/cert-manager-controller:v1.16.1"
           imagePullPolicy: IfNotPresent
           args:
           - --v=2
           - --cluster-resource-namespace=$(POD_NAMESPACE)
           - --leader-election-namespace=kube-system
-          - --acme-http01-solver-image=quay.io/jetstack/cert-manager-acmesolver:v1.14.4
+          - --acme-http01-solver-image=quay.io/jetstack/cert-manager-acmesolver:v1.16.1
           - --max-concurrent-challenges=60
           ports:
           - containerPort: 9402