From c5d6dd40bef83005a2a628648ca8f60766317500 Mon Sep 17 00:00:00 2001 From: Ekaterina Kazakova <41469478+eromanova@users.noreply.github.com> Date: Tue, 11 Feb 2025 15:11:54 +0400 Subject: [PATCH] Expose API server extra args in k0s config (#1062) Closes #955 --- templates/cluster/aws-hosted-cp/Chart.yaml | 2 +- .../templates/k0smotroncontrolplane.yaml | 5 +++++ .../cluster/aws-hosted-cp/values.schema.json | 13 +++++++++++++ templates/cluster/aws-hosted-cp/values.yaml | 4 +++- templates/cluster/aws-standalone-cp/Chart.yaml | 2 +- .../templates/k0scontrolplane.yaml | 3 +++ .../cluster/aws-standalone-cp/values.schema.json | 13 +++++++++++++ templates/cluster/aws-standalone-cp/values.yaml | 2 ++ templates/cluster/azure-hosted-cp/Chart.yaml | 2 +- .../templates/k0smotroncontrolplane.yaml | 5 +++++ .../cluster/azure-hosted-cp/values.schema.json | 13 +++++++++++++ templates/cluster/azure-hosted-cp/values.yaml | 2 ++ templates/cluster/azure-standalone-cp/Chart.yaml | 2 +- .../templates/k0scontrolplane.yaml | 3 +++ .../azure-standalone-cp/values.schema.json | 13 +++++++++++++ templates/cluster/azure-standalone-cp/values.yaml | 2 ++ .../cluster/openstack-standalone-cp/Chart.yaml | 2 +- .../templates/k0scontrolplane.yaml | 3 +++ .../openstack-standalone-cp/values.schema.json | 13 +++++++++++++ .../cluster/openstack-standalone-cp/values.yaml | 2 ++ templates/cluster/vsphere-hosted-cp/Chart.yaml | 2 +- .../templates/k0smotroncontrolplane.yaml | 5 +++++ .../cluster/vsphere-hosted-cp/values.schema.json | 13 +++++++++++++ templates/cluster/vsphere-hosted-cp/values.yaml | 2 ++ .../cluster/vsphere-standalone-cp/Chart.yaml | 2 +- .../templates/k0scontrolplane.yaml | 3 +++ .../vsphere-standalone-cp/values.schema.json | 13 +++++++++++++ .../cluster/vsphere-standalone-cp/values.yaml | 2 ++ ...ted-cp-0-1-0.yaml => aws-hosted-cp-0-1-1.yaml} | 4 ++-- ...cp-0-1-0.yaml => aws-standalone-cp-0-1-1.yaml} | 4 ++-- ...d-cp-0-1-0.yaml => azure-hosted-cp-0-1-1.yaml} | 4 ++-- ...-0-1-0.yaml => azure-standalone-cp-0-1-1.yaml} | 4 ++-- .../templates/openstack-standalone-cp-0-1-2.yaml | 15 +++++++++++++++ ...cp-0-1-0.yaml => vsphere-hosted-cp-0-1-1.yaml} | 4 ++-- ...-1-0.yaml => vsphere-standalone-cp-0-1-1.yaml} | 4 ++-- 35 files changed, 167 insertions(+), 20 deletions(-) rename templates/provider/kcm-templates/files/templates/{aws-hosted-cp-0-1-0.yaml => aws-hosted-cp-0-1-1.yaml} (84%) rename templates/provider/kcm-templates/files/templates/{aws-standalone-cp-0-1-0.yaml => aws-standalone-cp-0-1-1.yaml} (84%) rename templates/provider/kcm-templates/files/templates/{azure-hosted-cp-0-1-0.yaml => azure-hosted-cp-0-1-1.yaml} (84%) rename templates/provider/kcm-templates/files/templates/{azure-standalone-cp-0-1-0.yaml => azure-standalone-cp-0-1-1.yaml} (83%) create mode 100644 templates/provider/kcm-templates/files/templates/openstack-standalone-cp-0-1-2.yaml rename templates/provider/kcm-templates/files/templates/{vsphere-hosted-cp-0-1-0.yaml => vsphere-hosted-cp-0-1-1.yaml} (84%) rename templates/provider/kcm-templates/files/templates/{vsphere-standalone-cp-0-1-0.yaml => vsphere-standalone-cp-0-1-1.yaml} (83%) diff --git a/templates/cluster/aws-hosted-cp/Chart.yaml b/templates/cluster/aws-hosted-cp/Chart.yaml index 9792597fc..2766cc9a3 100644 --- a/templates/cluster/aws-hosted-cp/Chart.yaml +++ b/templates/cluster/aws-hosted-cp/Chart.yaml @@ -7,7 +7,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.1.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/templates/cluster/aws-hosted-cp/templates/k0smotroncontrolplane.yaml b/templates/cluster/aws-hosted-cp/templates/k0smotroncontrolplane.yaml index 222005e34..79e7528b4 100644 --- a/templates/cluster/aws-hosted-cp/templates/k0smotroncontrolplane.yaml +++ b/templates/cluster/aws-hosted-cp/templates/k0smotroncontrolplane.yaml @@ -19,6 +19,11 @@ spec: metadata: name: k0s spec: + {{- with .Values.k0s.api.extraArgs }} + api: + extraArgs: + {{- toYaml . | nindent 10 }} + {{- end }} network: provider: calico calico: diff --git a/templates/cluster/aws-hosted-cp/values.schema.json b/templates/cluster/aws-hosted-cp/values.schema.json index 1cd07eb5d..5fcf2e982 100644 --- a/templates/cluster/aws-hosted-cp/values.schema.json +++ b/templates/cluster/aws-hosted-cp/values.schema.json @@ -222,6 +222,19 @@ "version":{ "description": "K0s version to use", "type": "string" + }, + "api": { + "description": "Kubernetes api-server parameters", + "type": "object", + "properties": { + "extraArgs": { + "description": "Map of key-values (strings) for any extra arguments to pass down to Kubernetes api-server process", + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } } } } diff --git a/templates/cluster/aws-hosted-cp/values.yaml b/templates/cluster/aws-hosted-cp/values.yaml index 8757548b9..63da46b9b 100644 --- a/templates/cluster/aws-hosted-cp/values.yaml +++ b/templates/cluster/aws-hosted-cp/values.yaml @@ -50,6 +50,8 @@ k0smotron: # K0s parameters k0s: version: v1.31.5+k0s.0 + api: + extraArgs: {} # extensions defines custom Helm and image repositories to use for pulling # k0s extensions. @@ -58,4 +60,4 @@ extensions: imageRepository: "" # Name of the management cluster that this template is being deployed on -managementClusterName: "" \ No newline at end of file +managementClusterName: "" diff --git a/templates/cluster/aws-standalone-cp/Chart.yaml b/templates/cluster/aws-standalone-cp/Chart.yaml index 275a76a79..281ca28c2 100644 --- a/templates/cluster/aws-standalone-cp/Chart.yaml +++ b/templates/cluster/aws-standalone-cp/Chart.yaml @@ -6,7 +6,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.1.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/templates/cluster/aws-standalone-cp/templates/k0scontrolplane.yaml b/templates/cluster/aws-standalone-cp/templates/k0scontrolplane.yaml index f1992609e..2065e9b8b 100644 --- a/templates/cluster/aws-standalone-cp/templates/k0scontrolplane.yaml +++ b/templates/cluster/aws-standalone-cp/templates/k0scontrolplane.yaml @@ -20,6 +20,9 @@ spec: api: extraArgs: anonymous-auth: "true" + {{- with .Values.k0s.api.extraArgs }} + {{- toYaml . | nindent 12 }} + {{- end }} network: provider: calico calico: diff --git a/templates/cluster/aws-standalone-cp/values.schema.json b/templates/cluster/aws-standalone-cp/values.schema.json index 482d1d426..c293b0812 100644 --- a/templates/cluster/aws-standalone-cp/values.schema.json +++ b/templates/cluster/aws-standalone-cp/values.schema.json @@ -227,6 +227,19 @@ "version":{ "description": "K0s version to use", "type": "string" + }, + "api": { + "description": "Kubernetes api-server parameters", + "type": "object", + "properties": { + "extraArgs": { + "description": "Map of key-values (strings) for any extra arguments to pass down to Kubernetes api-server process", + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } } } } diff --git a/templates/cluster/aws-standalone-cp/values.yaml b/templates/cluster/aws-standalone-cp/values.yaml index 4bf1eb058..9d32583b2 100644 --- a/templates/cluster/aws-standalone-cp/values.yaml +++ b/templates/cluster/aws-standalone-cp/values.yaml @@ -51,6 +51,8 @@ worker: # K0s parameters k0s: version: v1.31.5+k0s.0 + api: + extraArgs: {} # extensions defines custom Helm and image repositories to use for pulling # k0s extensions. diff --git a/templates/cluster/azure-hosted-cp/Chart.yaml b/templates/cluster/azure-hosted-cp/Chart.yaml index 9138d8a32..a7f6db06b 100644 --- a/templates/cluster/azure-hosted-cp/Chart.yaml +++ b/templates/cluster/azure-hosted-cp/Chart.yaml @@ -7,7 +7,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.1.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/templates/cluster/azure-hosted-cp/templates/k0smotroncontrolplane.yaml b/templates/cluster/azure-hosted-cp/templates/k0smotroncontrolplane.yaml index a9bdcf710..6467ef7d1 100644 --- a/templates/cluster/azure-hosted-cp/templates/k0smotroncontrolplane.yaml +++ b/templates/cluster/azure-hosted-cp/templates/k0smotroncontrolplane.yaml @@ -18,6 +18,11 @@ spec: metadata: name: k0s spec: + {{- with .Values.k0s.api.extraArgs }} + api: + extraArgs: + {{- toYaml . | nindent 10 }} + {{- end }} network: provider: calico calico: diff --git a/templates/cluster/azure-hosted-cp/values.schema.json b/templates/cluster/azure-hosted-cp/values.schema.json index 21f8aa557..f8ef2be6d 100644 --- a/templates/cluster/azure-hosted-cp/values.schema.json +++ b/templates/cluster/azure-hosted-cp/values.schema.json @@ -212,6 +212,19 @@ "version":{ "description": "K0s version to use", "type": "string" + }, + "api": { + "description": "Kubernetes api-server parameters", + "type": "object", + "properties": { + "extraArgs": { + "description": "Map of key-values (strings) for any extra arguments to pass down to Kubernetes api-server process", + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } } } } diff --git a/templates/cluster/azure-hosted-cp/values.yaml b/templates/cluster/azure-hosted-cp/values.yaml index f4a63cd08..706d4e6a1 100644 --- a/templates/cluster/azure-hosted-cp/values.yaml +++ b/templates/cluster/azure-hosted-cp/values.yaml @@ -50,6 +50,8 @@ k0smotron: # K0s parameters k0s: version: v1.31.5+k0s.0 + api: + extraArgs: {} # extensions defines custom Helm and image repositories to use for pulling # k0s extensions. diff --git a/templates/cluster/azure-standalone-cp/Chart.yaml b/templates/cluster/azure-standalone-cp/Chart.yaml index 721e0a862..7ef303140 100644 --- a/templates/cluster/azure-standalone-cp/Chart.yaml +++ b/templates/cluster/azure-standalone-cp/Chart.yaml @@ -6,7 +6,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.1.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/templates/cluster/azure-standalone-cp/templates/k0scontrolplane.yaml b/templates/cluster/azure-standalone-cp/templates/k0scontrolplane.yaml index 950891399..7ecc1c002 100644 --- a/templates/cluster/azure-standalone-cp/templates/k0scontrolplane.yaml +++ b/templates/cluster/azure-standalone-cp/templates/k0scontrolplane.yaml @@ -20,6 +20,9 @@ spec: api: extraArgs: anonymous-auth: "true" + {{- with .Values.k0s.api.extraArgs }} + {{- toYaml . | nindent 12 }} + {{- end }} network: provider: calico calico: diff --git a/templates/cluster/azure-standalone-cp/values.schema.json b/templates/cluster/azure-standalone-cp/values.schema.json index ef9f65116..9b7ea0831 100644 --- a/templates/cluster/azure-standalone-cp/values.schema.json +++ b/templates/cluster/azure-standalone-cp/values.schema.json @@ -205,6 +205,19 @@ "version":{ "description": "K0s version to use", "type": "string" + }, + "api": { + "description": "Kubernetes api-server parameters", + "type": "object", + "properties": { + "extraArgs": { + "description": "Map of key-values (strings) for any extra arguments to pass down to Kubernetes api-server process", + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } } } } diff --git a/templates/cluster/azure-standalone-cp/values.yaml b/templates/cluster/azure-standalone-cp/values.yaml index b6a5e01a2..702652fc3 100644 --- a/templates/cluster/azure-standalone-cp/values.yaml +++ b/templates/cluster/azure-standalone-cp/values.yaml @@ -48,6 +48,8 @@ worker: # K0s parameters k0s: version: v1.31.5+k0s.0 + api: + extraArgs: {} # extensions defines custom Helm and image repositories to use for pulling # k0s extensions. diff --git a/templates/cluster/openstack-standalone-cp/Chart.yaml b/templates/cluster/openstack-standalone-cp/Chart.yaml index 9b2491613..41adad7da 100644 --- a/templates/cluster/openstack-standalone-cp/Chart.yaml +++ b/templates/cluster/openstack-standalone-cp/Chart.yaml @@ -6,7 +6,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.1 +version: 0.1.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/templates/cluster/openstack-standalone-cp/templates/k0scontrolplane.yaml b/templates/cluster/openstack-standalone-cp/templates/k0scontrolplane.yaml index fffb4fd81..888a62017 100644 --- a/templates/cluster/openstack-standalone-cp/templates/k0scontrolplane.yaml +++ b/templates/cluster/openstack-standalone-cp/templates/k0scontrolplane.yaml @@ -18,6 +18,9 @@ spec: api: extraArgs: anonymous-auth: "true" + {{- with .Values.k0s.api.extraArgs }} + {{- toYaml . | nindent 12 }} + {{- end }} extensions: helm: repositories: diff --git a/templates/cluster/openstack-standalone-cp/values.schema.json b/templates/cluster/openstack-standalone-cp/values.schema.json index 77f448480..22a75aa85 100644 --- a/templates/cluster/openstack-standalone-cp/values.schema.json +++ b/templates/cluster/openstack-standalone-cp/values.schema.json @@ -571,6 +571,19 @@ "version": { "type": "string", "description": "K0s version to use" + }, + "api": { + "description": "Kubernetes api-server parameters", + "type": "object", + "properties": { + "extraArgs": { + "description": "Map of key-values (strings) for any extra arguments to pass down to Kubernetes api-server process", + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } } } } diff --git a/templates/cluster/openstack-standalone-cp/values.yaml b/templates/cluster/openstack-standalone-cp/values.yaml index 24b5f7ff4..dea2614eb 100644 --- a/templates/cluster/openstack-standalone-cp/values.yaml +++ b/templates/cluster/openstack-standalone-cp/values.yaml @@ -73,3 +73,5 @@ worker: k0s: version: v1.31.5+k0s.0 + api: + extraArgs: {} diff --git a/templates/cluster/vsphere-hosted-cp/Chart.yaml b/templates/cluster/vsphere-hosted-cp/Chart.yaml index 90eaaaaaf..f287eec4f 100644 --- a/templates/cluster/vsphere-hosted-cp/Chart.yaml +++ b/templates/cluster/vsphere-hosted-cp/Chart.yaml @@ -7,7 +7,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.1.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/templates/cluster/vsphere-hosted-cp/templates/k0smotroncontrolplane.yaml b/templates/cluster/vsphere-hosted-cp/templates/k0smotroncontrolplane.yaml index 01c2963e9..4cd39f2e0 100644 --- a/templates/cluster/vsphere-hosted-cp/templates/k0smotroncontrolplane.yaml +++ b/templates/cluster/vsphere-hosted-cp/templates/k0smotroncontrolplane.yaml @@ -18,6 +18,11 @@ spec: metadata: name: k0s spec: + {{- with .Values.k0s.api.extraArgs }} + api: + extraArgs: + {{- toYaml . | nindent 10 }} + {{- end }} network: provider: calico calico: diff --git a/templates/cluster/vsphere-hosted-cp/values.schema.json b/templates/cluster/vsphere-hosted-cp/values.schema.json index 70d597e64..f3dc5bede 100644 --- a/templates/cluster/vsphere-hosted-cp/values.schema.json +++ b/templates/cluster/vsphere-hosted-cp/values.schema.json @@ -152,6 +152,19 @@ "version":{ "description": "K0s version to use", "type": "string" + }, + "api": { + "description": "Kubernetes api-server parameters", + "type": "object", + "properties": { + "extraArgs": { + "description": "Map of key-values (strings) for any extra arguments to pass down to Kubernetes api-server process", + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } } } } diff --git a/templates/cluster/vsphere-hosted-cp/values.yaml b/templates/cluster/vsphere-hosted-cp/values.yaml index 956726a8b..9cce2ac17 100644 --- a/templates/cluster/vsphere-hosted-cp/values.yaml +++ b/templates/cluster/vsphere-hosted-cp/values.yaml @@ -44,6 +44,8 @@ k0smotron: # K0s parameters k0s: version: v1.31.5+k0s.0 + api: + extraArgs: {} # extensions defines custom Helm and image repositories to use for pulling # k0s extensions. diff --git a/templates/cluster/vsphere-standalone-cp/Chart.yaml b/templates/cluster/vsphere-standalone-cp/Chart.yaml index e8372cc8f..6446d4c82 100644 --- a/templates/cluster/vsphere-standalone-cp/Chart.yaml +++ b/templates/cluster/vsphere-standalone-cp/Chart.yaml @@ -6,7 +6,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.1.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/templates/cluster/vsphere-standalone-cp/templates/k0scontrolplane.yaml b/templates/cluster/vsphere-standalone-cp/templates/k0scontrolplane.yaml index e20112915..844be5d12 100644 --- a/templates/cluster/vsphere-standalone-cp/templates/k0scontrolplane.yaml +++ b/templates/cluster/vsphere-standalone-cp/templates/k0scontrolplane.yaml @@ -27,6 +27,9 @@ spec: - {{ .Values.controlPlaneEndpointIP }} extraArgs: anonymous-auth: "true" + {{- with .Values.k0s.api.extraArgs }} + {{- toYaml . | nindent 12 }} + {{- end }} network: provider: calico calico: diff --git a/templates/cluster/vsphere-standalone-cp/values.schema.json b/templates/cluster/vsphere-standalone-cp/values.schema.json index 079254098..614716466 100644 --- a/templates/cluster/vsphere-standalone-cp/values.schema.json +++ b/templates/cluster/vsphere-standalone-cp/values.schema.json @@ -204,6 +204,19 @@ "version":{ "description": "K0s version to use", "type": "string" + }, + "api": { + "description": "Kubernetes api-server parameters", + "type": "object", + "properties": { + "extraArgs": { + "description": "Map of key-values (strings) for any extra arguments to pass down to Kubernetes api-server process", + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } } } } diff --git a/templates/cluster/vsphere-standalone-cp/values.yaml b/templates/cluster/vsphere-standalone-cp/values.yaml index 26d88d86f..99521f0dd 100644 --- a/templates/cluster/vsphere-standalone-cp/values.yaml +++ b/templates/cluster/vsphere-standalone-cp/values.yaml @@ -48,6 +48,8 @@ worker: # K0s parameters k0s: version: v1.31.5+k0s.0 + api: + extraArgs: {} # extensions defines custom Helm and image repositories to use for pulling # k0s extensions. diff --git a/templates/provider/kcm-templates/files/templates/aws-hosted-cp-0-1-0.yaml b/templates/provider/kcm-templates/files/templates/aws-hosted-cp-0-1-1.yaml similarity index 84% rename from templates/provider/kcm-templates/files/templates/aws-hosted-cp-0-1-0.yaml rename to templates/provider/kcm-templates/files/templates/aws-hosted-cp-0-1-1.yaml index f26f02c36..34f863f0b 100644 --- a/templates/provider/kcm-templates/files/templates/aws-hosted-cp-0-1-0.yaml +++ b/templates/provider/kcm-templates/files/templates/aws-hosted-cp-0-1-1.yaml @@ -1,14 +1,14 @@ apiVersion: k0rdent.mirantis.com/v1alpha1 kind: ClusterTemplate metadata: - name: aws-hosted-cp-0-1-0 + name: aws-hosted-cp-0-1-1 annotations: helm.sh/resource-policy: keep spec: helm: chartSpec: chart: aws-hosted-cp - version: 0.1.0 + version: 0.1.1 interval: 10m0s sourceRef: kind: HelmRepository diff --git a/templates/provider/kcm-templates/files/templates/aws-standalone-cp-0-1-0.yaml b/templates/provider/kcm-templates/files/templates/aws-standalone-cp-0-1-1.yaml similarity index 84% rename from templates/provider/kcm-templates/files/templates/aws-standalone-cp-0-1-0.yaml rename to templates/provider/kcm-templates/files/templates/aws-standalone-cp-0-1-1.yaml index fd4a92312..bcc79c0f1 100644 --- a/templates/provider/kcm-templates/files/templates/aws-standalone-cp-0-1-0.yaml +++ b/templates/provider/kcm-templates/files/templates/aws-standalone-cp-0-1-1.yaml @@ -1,14 +1,14 @@ apiVersion: k0rdent.mirantis.com/v1alpha1 kind: ClusterTemplate metadata: - name: aws-standalone-cp-0-1-0 + name: aws-standalone-cp-0-1-1 annotations: helm.sh/resource-policy: keep spec: helm: chartSpec: chart: aws-standalone-cp - version: 0.1.0 + version: 0.1.1 interval: 10m0s sourceRef: kind: HelmRepository diff --git a/templates/provider/kcm-templates/files/templates/azure-hosted-cp-0-1-0.yaml b/templates/provider/kcm-templates/files/templates/azure-hosted-cp-0-1-1.yaml similarity index 84% rename from templates/provider/kcm-templates/files/templates/azure-hosted-cp-0-1-0.yaml rename to templates/provider/kcm-templates/files/templates/azure-hosted-cp-0-1-1.yaml index f4c7c3cd1..7a5742249 100644 --- a/templates/provider/kcm-templates/files/templates/azure-hosted-cp-0-1-0.yaml +++ b/templates/provider/kcm-templates/files/templates/azure-hosted-cp-0-1-1.yaml @@ -1,14 +1,14 @@ apiVersion: k0rdent.mirantis.com/v1alpha1 kind: ClusterTemplate metadata: - name: azure-hosted-cp-0-1-0 + name: azure-hosted-cp-0-1-1 annotations: helm.sh/resource-policy: keep spec: helm: chartSpec: chart: azure-hosted-cp - version: 0.1.0 + version: 0.1.1 interval: 10m0s sourceRef: kind: HelmRepository diff --git a/templates/provider/kcm-templates/files/templates/azure-standalone-cp-0-1-0.yaml b/templates/provider/kcm-templates/files/templates/azure-standalone-cp-0-1-1.yaml similarity index 83% rename from templates/provider/kcm-templates/files/templates/azure-standalone-cp-0-1-0.yaml rename to templates/provider/kcm-templates/files/templates/azure-standalone-cp-0-1-1.yaml index ba5f2ca7d..ac3fd7203 100644 --- a/templates/provider/kcm-templates/files/templates/azure-standalone-cp-0-1-0.yaml +++ b/templates/provider/kcm-templates/files/templates/azure-standalone-cp-0-1-1.yaml @@ -1,14 +1,14 @@ apiVersion: k0rdent.mirantis.com/v1alpha1 kind: ClusterTemplate metadata: - name: azure-standalone-cp-0-1-0 + name: azure-standalone-cp-0-1-1 annotations: helm.sh/resource-policy: keep spec: helm: chartSpec: chart: azure-standalone-cp - version: 0.1.0 + version: 0.1.1 interval: 10m0s sourceRef: kind: HelmRepository diff --git a/templates/provider/kcm-templates/files/templates/openstack-standalone-cp-0-1-2.yaml b/templates/provider/kcm-templates/files/templates/openstack-standalone-cp-0-1-2.yaml new file mode 100644 index 000000000..9c38b3978 --- /dev/null +++ b/templates/provider/kcm-templates/files/templates/openstack-standalone-cp-0-1-2.yaml @@ -0,0 +1,15 @@ +apiVersion: k0rdent.mirantis.com/v1alpha1 +kind: ClusterTemplate +metadata: + name: openstack-standalone-cp-0-1-2 + annotations: + helm.sh/resource-policy: keep +spec: + helm: + chartSpec: + chart: openstack-standalone-cp + version: 0.1.2 + interval: 10m0s + sourceRef: + kind: HelmRepository + name: kcm-templates diff --git a/templates/provider/kcm-templates/files/templates/vsphere-hosted-cp-0-1-0.yaml b/templates/provider/kcm-templates/files/templates/vsphere-hosted-cp-0-1-1.yaml similarity index 84% rename from templates/provider/kcm-templates/files/templates/vsphere-hosted-cp-0-1-0.yaml rename to templates/provider/kcm-templates/files/templates/vsphere-hosted-cp-0-1-1.yaml index 033b5a00c..48406d53d 100644 --- a/templates/provider/kcm-templates/files/templates/vsphere-hosted-cp-0-1-0.yaml +++ b/templates/provider/kcm-templates/files/templates/vsphere-hosted-cp-0-1-1.yaml @@ -1,14 +1,14 @@ apiVersion: k0rdent.mirantis.com/v1alpha1 kind: ClusterTemplate metadata: - name: vsphere-hosted-cp-0-1-0 + name: vsphere-hosted-cp-0-1-1 annotations: helm.sh/resource-policy: keep spec: helm: chartSpec: chart: vsphere-hosted-cp - version: 0.1.0 + version: 0.1.1 interval: 10m0s sourceRef: kind: HelmRepository diff --git a/templates/provider/kcm-templates/files/templates/vsphere-standalone-cp-0-1-0.yaml b/templates/provider/kcm-templates/files/templates/vsphere-standalone-cp-0-1-1.yaml similarity index 83% rename from templates/provider/kcm-templates/files/templates/vsphere-standalone-cp-0-1-0.yaml rename to templates/provider/kcm-templates/files/templates/vsphere-standalone-cp-0-1-1.yaml index f94b13802..f48690159 100644 --- a/templates/provider/kcm-templates/files/templates/vsphere-standalone-cp-0-1-0.yaml +++ b/templates/provider/kcm-templates/files/templates/vsphere-standalone-cp-0-1-1.yaml @@ -1,14 +1,14 @@ apiVersion: k0rdent.mirantis.com/v1alpha1 kind: ClusterTemplate metadata: - name: vsphere-standalone-cp-0-1-0 + name: vsphere-standalone-cp-0-1-1 annotations: helm.sh/resource-policy: keep spec: helm: chartSpec: chart: vsphere-standalone-cp - version: 0.1.0 + version: 0.1.1 interval: 10m0s sourceRef: kind: HelmRepository