Skip to content

Commit 468a391

Browse files
androndoclaude
andcommitted
fix(linstor-scheduler): bump to upstream chart 0.2.5, dropping the admission webhook
Supersedes the interim extender.image.tag override with a full vendored-chart bump to upstream 0.2.5 (appVersion v0.3.5) — 'as in upstream'. Upstream removed the scheduler-admission mutating webhook in this release (piraeus-operator#1025): that webhook (extender v0.3.2) decoded every pod through a stale vendored k8s.io/api (v0.25) and re-encoded it, stripping fields unknown to that schema — including initContainers[].restartPolicy — from ALL pods cluster-wide, which broke the CloudNativePG barman-cloud plugin's native sidecar (cozystack#3300) and collapsed image VolumeSources (KubeVirt). Consequence of dropping the webhook: pods are no longer auto-assigned spec.schedulerName=linstor-scheduler; they use the default scheduler and LINSTOR data locality becomes advisory (the extender still runs as a kube-scheduler plugin for workloads that opt in via schedulerName). Also drops the obsolete disable-ca-key-rotation patch (targeted the removed admission cert). Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]> Signed-off-by: Andrey Kolkov <[email protected]>
1 parent a169a5b commit 468a391

11 files changed

Lines changed: 16 additions & 288 deletions

File tree

‎packages/system/linstor-scheduler/Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ update:
1010
rm -rf charts
1111
helm repo add piraeus-charts https://piraeus.io/helm-charts/
1212
helm repo update piraeus-charts
13-
helm pull piraeus-charts/linstor-scheduler --untar --untardir charts
14-
patch --no-backup-if-mismatch -p4 < patches/disable-ca-key-rotation.patch
13+
helm pull piraeus-charts/linstor-scheduler --untar --untardir charts --version 0.2.5
1514
patch --no-backup-if-mismatch -p4 < patches/add-scheduler-component-label.patch

‎packages/system/linstor-scheduler/charts/linstor-scheduler/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: v0.3.2
2+
appVersion: v0.3.5
33
deprecated: true
44
description: 'Deploys a new kubernetes scheduler, configured to take advantage of
55
storage system information. If a Pod is using a LINSTOR volume, the scheduler will
@@ -16,4 +16,4 @@ name: linstor-scheduler
1616
sources:
1717
- https://github.com/piraeusdatastore/linstor-scheduler-extender
1818
type: application
19-
version: 0.2.3
19+
version: 0.2.5

‎packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-deployment.yaml‎

Lines changed: 0 additions & 98 deletions
This file was deleted.

‎packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-service.yaml‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎packages/system/linstor-scheduler/charts/linstor-scheduler/templates/certmanager.yaml‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎packages/system/linstor-scheduler/charts/linstor-scheduler/templates/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
{{- toYaml .Values.podSecurityContext | nindent 8 }}
3232
containers:
3333
- name: kube-scheduler
34-
image: "{{ .Values.scheduler.image.repository }}:{{ .Values.scheduler.image.tag | default (include "linstor-scheduler.kubeVersion" .) }}"
34+
image: "{{ .Values.scheduler.image.repository }}:{{ .Values.scheduler.image.tag | default .Capabilities.KubeVersion.Version }}"
3535
securityContext:
3636
{{- toYaml .Values.scheduler.securityContext | nindent 12 }}
3737
command:

‎packages/system/linstor-scheduler/charts/linstor-scheduler/templates/mutatingwebhookconfiguration.yaml‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎packages/system/linstor-scheduler/charts/linstor-scheduler/templates/rbac.yaml‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,33 +24,6 @@ rules:
2424
- list
2525
- watch
2626
{{- end }}
27-
{{- if .Values.admission.enabled }}
28-
---
29-
apiVersion: rbac.authorization.k8s.io/v1
30-
kind: ClusterRole
31-
metadata:
32-
name: {{ include "linstor-scheduler.fullname" . }}-admission
33-
rules:
34-
- apiGroups: [""]
35-
resources: ["pods", "persistentvolumeclaims", "persistentvolumes"]
36-
verbs: ["get"]
37-
- apiGroups: ["storage.k8s.io"]
38-
resources: ["storageclasses"]
39-
verbs: ["get"]
40-
---
41-
apiVersion: rbac.authorization.k8s.io/v1
42-
kind: ClusterRoleBinding
43-
metadata:
44-
name: {{ include "linstor-scheduler.fullname" . }}-admission
45-
roleRef:
46-
apiGroup: rbac.authorization.k8s.io
47-
kind: ClusterRole
48-
name: {{ include "linstor-scheduler.fullname" . }}-admission
49-
subjects:
50-
- kind: ServiceAccount
51-
name: {{ include "linstor-scheduler.serviceAccountName" . }}
52-
namespace: {{ .Release.Namespace }}
53-
{{- end }}
5427
---
5528
apiVersion: rbac.authorization.k8s.io/v1
5629
kind: ClusterRoleBinding

‎packages/system/linstor-scheduler/charts/linstor-scheduler/values.yaml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -86,21 +86,3 @@ nodeSelector: {}
8686
tolerations: []
8787

8888
affinity: {}
89-
90-
admission:
91-
enabled: false
92-
replicaCount: 2
93-
failurePolicy: Ignore
94-
namespaceSelector: {}
95-
# matchExpressions:
96-
# - key: kubernetes.io/metadata.name
97-
# operator: NotIn
98-
# values:
99-
# - kube-system
100-
resources: {}
101-
# limits:
102-
# cpu: 100m
103-
# memory: 128Mi
104-
# requests:
105-
# cpu: 10m
106-
# memory: 64Mi

‎packages/system/linstor-scheduler/patches/disable-ca-key-rotation.patch‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)