Expose API server extra args in k0s config (k0rdent#1062)

Closes k0rdent#955
eromanova · Feb 11, 2025 · c5d6dd4 · c5d6dd4
1 parent ef39101
commit c5d6dd4
Show file tree

Hide file tree

Showing 35 changed files with 167 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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: ""
+managementClusterName: ""
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/.../files/templates/aws-hosted-cp-0-1-0.yaml → .../files/templates/aws-hosted-cp-0-1-1.yaml b/.../files/templates/aws-hosted-cp-0-1-0.yaml → .../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/...es/templates/aws-standalone-cp-0-1-0.yaml → ...es/templates/aws-standalone-cp-0-1-1.yaml b/...es/templates/aws-standalone-cp-0-1-0.yaml → ...es/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/...iles/templates/azure-hosted-cp-0-1-0.yaml → ...iles/templates/azure-hosted-cp-0-1-1.yaml b/...iles/templates/azure-hosted-cp-0-1-0.yaml → ...iles/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
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,3 +73,5 @@ worker: @@
     k0s:
       version: v1.31.5+k0s.0
+      api:
+        extraArgs: {}