Merge pull request #39 from Mirantis/templates-fixes

Several templates fixes
K0rdent · Jun 19, 2024 · 798062d · 798062d
2 parents 8ce544e + eb7cafd
commit 798062d
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 11 deletions.
diff --git a/templates/aws-hosted-cp/templates/awsmachinetemplate.yaml b/templates/aws-hosted-cp/templates/awsmachinetemplate.yaml
@@ -19,3 +19,4 @@ spec:
       {{- if .Values.sshKeyName }}
       sshKeyName: {{ .Values.sshKeyName }}
       {{- end }}
+      publicIP: {{ .Values.publicIP }}
diff --git a/templates/aws-hosted-cp/values.yaml b/templates/aws-hosted-cp/values.yaml
@@ -13,7 +13,10 @@ clusterNetwork:
 vpcID: ""
 region: ""
 sshKeyName: ""
-subnets: []
+publicIP: false
+subnets:
+  - id: ""
+    availabilityZone: ""
 
 # AWS machines parameters
 amiID: ""

diff --git a/templates/aws-standalone-cp/templates/awsmachinetemplate-controlplane.yaml b/templates/aws-standalone-cp/templates/awsmachinetemplate-controlplane.yaml
@@ -21,3 +21,4 @@ spec:
       {{- if .Values.sshKeyName }}
       sshKeyName: {{ .Values.sshKeyName }}
       {{- end }}
+      publicIP: {{ .Values.publicIP }}
diff --git a/templates/aws-standalone-cp/templates/awsmachinetemplate-worker.yaml b/templates/aws-standalone-cp/templates/awsmachinetemplate-worker.yaml
@@ -21,3 +21,4 @@ spec:
       {{- if .Values.sshKeyName }}
       sshKeyName: {{ .Values.sshKeyName }}
       {{- end }}
+      publicIP: {{ .Values.publicIP }}
diff --git a/templates/aws-standalone-cp/values.yaml b/templates/aws-standalone-cp/values.yaml
@@ -14,7 +14,10 @@ clusterNetwork:
 vpcID: ""
 region: ""
 sshKeyName: ""
-subnets: []
+publicIP: false
+subnets:
+  - id: ""
+    availabilityZone: ""
 
 controlPlaneLoadBalancer:
   additionalSecurityGroups: []

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: