Merge pull request #5 from evgkrsk/adapt-to-k8s-1.24

Majour update to run on k8s-1.24
evgkrsk · Feb 12, 2023 · 79969c8 · 79969c8
2 parents c625462 + d5e7d1d
commit 79969c8
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 3 deletions.
diff --git a/charts/scheduler-plugins/Chart.yaml b/charts/scheduler-plugins/Chart.yaml
@@ -15,7 +15,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.2.3
+version: 1.0.0
 
 # 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

diff --git a/charts/scheduler-plugins/README.md b/charts/scheduler-plugins/README.md
@@ -1,6 +1,6 @@
 # scheduler-plugins
 
-![Version: 0.2.3](https://img.shields.io/badge/Version-0.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.24.9](https://img.shields.io/badge/AppVersion-v0.24.9-informational?style=flat-square)
+![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.24.9](https://img.shields.io/badge/AppVersion-v0.24.9-informational?style=flat-square)
 
 Deploy scheduler-plugins as a default/second scheduler in cluster
 
@@ -41,6 +41,20 @@ Deploy scheduler-plugins as a default/second scheduler in cluster
 | securityContext.runAsUser | int | `1000` |  |
 | securityContext.runAsGroup | int | `1000` |  |
 | securityContext.capabilities.drop[0] | string | `"ALL"` |  |
+| schedulerConfig.apiVersion | string | `"kubescheduler.config.k8s.io/v1beta2"` | scheduler config apiversion (ref: https://kubernetes.io/docs/reference/scheduling/config/) |
+
+## Upgrading an existing Release to a new major version
+
+A major chart version change (like v0.2.3 -> v1.0.0) indicates that there is an incompatible breaking change needing manual actions.
+
+### From 0.x to 1.x
+
+This version changes default kube-scheduler config apiversion to
+`"kubescheduler.config.k8s.io/v1beta2"` to be compatible with
+k8s-1.24.x (latest supported by scheduler-plugins at a moment).
+
+You have to change "schedulerConfig.apiVersion" in values if you use
+chart with older k8s.
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
diff --git a/charts/scheduler-plugins/README.md.gotmpl b/charts/scheduler-plugins/README.md.gotmpl
@@ -0,0 +1,33 @@
+{{/* -*- mode: markdown; mode: view -*- */}}
+{{- template "chart.header" . }}
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.badgesSection" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+{{ template "chart.maintainersSection" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}
+
+
+## Upgrading an existing Release to a new major version
+
+A major chart version change (like v0.2.3 -> v1.0.0) indicates that there is an incompatible breaking change needing manual actions.
+
+### From 0.x to 1.x
+
+This version changes default kube-scheduler config apiversion to
+`"kubescheduler.config.k8s.io/v1beta2"` to be compatible with
+k8s-1.24.x (latest supported by scheduler-plugins at a moment).
+
+You have to change "schedulerConfig.apiVersion" in values if you use
+chart with older k8s.
+
+{{ template "helm-docs.versionFooter" . }}
diff --git a/charts/scheduler-plugins/templates/configmap.yaml b/charts/scheduler-plugins/templates/configmap.yaml
@@ -7,7 +7,7 @@ metadata:
     {{- include "scheduler-plugins.labels" . | nindent 4 }}
 data:
   scheduler-config.yaml: |
-    apiVersion: kubescheduler.config.k8s.io/v1beta1
+    apiVersion: {{ .Values.schedulerConfig.apiVersion }}
     kind: KubeSchedulerConfiguration
     clientConnection:
       qps: {{ .Values.scheduler.qps }}

diff --git a/charts/scheduler-plugins/templates/rbac.yaml b/charts/scheduler-plugins/templates/rbac.yaml
@@ -8,6 +8,9 @@ rules:
 - apiGroups: ["metrics.k8s.io"]
   resources: ["nodes"]
   verbs: ["list"]
+- apiGroups: [""]
+  resources: ["namespaces"]
+  verbs: ["get", "list", "watch"]
 - apiGroups: [""]
   resources: ["configmaps"]
   verbs: ["get", "list", "watch"]

diff --git a/charts/scheduler-plugins/values.yaml b/charts/scheduler-plugins/values.yaml
@@ -109,3 +109,7 @@ pluginConfig:
       # metricProvider: # By default, `metricProviderType` is `KubernetesMetricsServer`
       #   type: Prometheus
       #   address: http://prometheus-k8s.monitoring.svc.cluster.local:9090
+
+schedulerConfig:
+  # -- scheduler config apiversion (ref: https://kubernetes.io/docs/reference/scheduling/config/)
+  apiVersion: kubescheduler.config.k8s.io/v1beta2