Fix CRDs inject-ca-from annotation in cluster-api

k0rdent · Jun 19, 2024 · eb7cafd · eb7cafd
1 parent 275dc00
commit eb7cafd
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/templates/cluster-api/templates/crds/clusterclasses.yaml b/templates/cluster-api/templates/crds/clusterclasses.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capi-system/capi-serving-cert
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "cluster-api.fullname" . }}-serving-cert
     controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   labels:

diff --git a/templates/cluster-api/templates/crds/clusterresourcesetbindings.yaml b/templates/cluster-api/templates/crds/clusterresourcesetbindings.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capi-system/capi-serving-cert
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "cluster-api.fullname" . }}-serving-cert
     controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   labels:

diff --git a/templates/cluster-api/templates/crds/clusterresourcesets.yaml b/templates/cluster-api/templates/crds/clusterresourcesets.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capi-system/capi-serving-cert
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "cluster-api.fullname" . }}-serving-cert
     controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   labels:

diff --git a/templates/cluster-api/templates/crds/clusters.yaml b/templates/cluster-api/templates/crds/clusters.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capi-system/capi-serving-cert
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "cluster-api.fullname" . }}-serving-cert
     controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   labels:

diff --git a/templates/cluster-api/templates/crds/machinedeployments.yaml b/templates/cluster-api/templates/crds/machinedeployments.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capi-system/capi-serving-cert
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "cluster-api.fullname" . }}-serving-cert
     controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   labels:

diff --git a/templates/cluster-api/templates/crds/machinehealthchecks.yaml b/templates/cluster-api/templates/crds/machinehealthchecks.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capi-system/capi-serving-cert
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "cluster-api.fullname" . }}-serving-cert
     controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   labels:

diff --git a/templates/cluster-api/templates/crds/machinepools.yaml b/templates/cluster-api/templates/crds/machinepools.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capi-system/capi-serving-cert
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "cluster-api.fullname" . }}-serving-cert
     controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   labels:

diff --git a/templates/cluster-api/templates/crds/machines.yaml b/templates/cluster-api/templates/crds/machines.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capi-system/capi-serving-cert
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "cluster-api.fullname" . }}-serving-cert
     controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   labels:

diff --git a/templates/cluster-api/templates/crds/machinesets.yaml b/templates/cluster-api/templates/crds/machinesets.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capi-system/capi-serving-cert
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "cluster-api.fullname" . }}-serving-cert
     controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   labels: