Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump csi snapshotter controller and validation-webhook charts #533

Merged
merged 2 commits into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
type: application
-name: snapshot-controller
+name: rke2-snapshot-controller
version: 1.7.2
appVersion: "v6.2.1"
icon: https://github.com/piraeusdatastore/piraeus/master/artwork/sandbox-artwork/icon/color.svg
version: 3.0.6
appVersion: "v8.1.0"
kubeVersion: ">= 1.25.0-0"
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
--- charts-original/templates/_helpers.tpl
+++ charts/templates/_helpers.tpl
@@ -55,3 +55,11 @@
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}
@@ -132,3 +132,11 @@
{{- include "snapshot-validation-webhook.fullname" . }}-tls
{{- end }}
{{- end }}
+
+{{- define "system_default_registry" -}}
+{{- if .Values.global.systemDefaultRegistry -}}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- charts-original/templates/deployment_controller.yaml
+++ charts/templates/deployment_controller.yaml
@@ -34,7 +34,7 @@
- name: {{ .Chart.Name }}
securityContext:
{{- toYaml .Values.controller.securityContext | nindent 12 }}
- image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag | default .Chart.AppVersion }}"
+ image: "{{ template "system_default_registry" . }}{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
args:
{{- range $flag, $val := .Values.controller.args }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- charts-original/templates/deployment_validation_webhook.yaml
+++ charts/templates/deployment_validation_webhook.yaml
@@ -37,7 +37,7 @@
- name: {{ include "snapshot-validation-webhook.name" . }}
securityContext:
{{- toYaml .Values.webhook.securityContext | nindent 12 }}
- image: "{{ .Values.webhook.image.repository }}:{{ .Values.webhook.image.tag | default .Chart.AppVersion }}"
+ image: "{{ template "system_default_registry" . }}{{ .Values.webhook.image.repository }}:{{ .Values.webhook.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.webhook.image.pullPolicy }}
args:
{{- range $flag, $val := .Values.webhook.args }}
Original file line number Diff line number Diff line change
@@ -1,37 +1,88 @@
--- charts-original/values.yaml
+++ charts/values.yaml
@@ -6,7 +6,7 @@
httpEndpoint: ":8080"

image:
- repository: registry.k8s.io/sig-storage/snapshot-controller
+ repository: rancher/mirrored-sig-storage-snapshot-controller
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: ""
@@ -27,9 +27,16 @@

resources: {}

-nodeSelector: {}
+nodeSelector:
+ kubernetes.io/os: linux

-tolerations: []
+tolerations:
+- key: "node-role.kubernetes.io/control-plane"
+ operator: "Exists"
+ effect: "NoSchedule"
+- key: "node-role.kubernetes.io/etcd"
+ operator: "Exists"
+ effect: "NoExecute"

affinity: {}

@@ -54,3 +61,6 @@
# velero.io/csi-volumesnapshot-class: "true"
# driver: linstor.csi.linbit.com
# deletionPolicy: Delete
@@ -11,7 +11,7 @@
httpEndpoint: ":8080"

image:
- repository: registry.k8s.io/sig-storage/snapshot-controller
+ repository: rancher/mirrored-sig-storage-snapshot-controller
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: ""
@@ -35,9 +35,16 @@

resources: {}

- nodeSelector: {}
+ nodeSelector:
+ kubernetes.io/os: linux

- tolerations: []
+ tolerations:
+ - key: "node-role.kubernetes.io/control-plane"
+ operator: "Exists"
+ effect: "NoSchedule"
+ - key: "node-role.kubernetes.io/etcd"
+ operator: "Exists"
+ effect: "NoExecute"

affinity: {}

@@ -82,7 +89,7 @@
dnsPolicy: ClusterFirst

webhook:
- enabled: true
+ enabled: false

replicaCount: 1

@@ -95,7 +102,7 @@
# enableVolumeGroupSnapshotWebhook: true

image:
- repository: registry.k8s.io/sig-storage/snapshot-validation-webhook
+ repository: rancher/mirrored-sig-storage-snapshot-validation-webhook
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: ""
@@ -150,9 +157,16 @@

resources: {}

- nodeSelector: {}
+ nodeSelector:
+ kubernetes.io/os: linux

- tolerations: []
+ tolerations:
+ - key: "node-role.kubernetes.io/control-plane"
+ operator: "Exists"
+ effect: "NoSchedule"
+ - key: "node-role.kubernetes.io/etcd"
+ operator: "Exists"
+ effect: "NoExecute"

affinity: {}

@@ -173,8 +187,18 @@
dnsPolicy: ClusterFirst

tests:
- nodeSelector: { }
+ nodeSelector:
+ kubernetes.io/os: linux

- tolerations: [ ]
+ tolerations:
+ - key: "node-role.kubernetes.io/control-plane"
+ operator: "Exists"
+ effect: "NoSchedule"
+ - key: "node-role.kubernetes.io/etcd"
+ operator: "Exists"
+ effect: "NoExecute"

affinity: { }
+
+global:
+ systemDefaultRegistry: ""
4 changes: 2 additions & 2 deletions packages/rke2-snapshot-controller/package.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
url: https://github.com/piraeusdatastore/helm-charts.git
subdirectory: charts/snapshot-controller
commit: 100f3d3c3513e14b423093cbb1a6f8fdd38fafd1 # snapshot-controller-1.7.2
packageVersion: 02
commit: 79c15f2317860baf58fa70d00ff355a631a77206 # snapshot-controller-3.0.6
packageVersion: 00
additionalCharts:
- workingDir: charts-crd
crdOptions:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
version: 1.7.2
appVersion: "v6.2.1"
version: 3.0.6
appVersion: "v8.1.0"
description: Installs the CRDs for rke2-snapshot-controller
name: rke2-snapshot-controller-crd
type: application

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,10 +1,27 @@
--- charts-original/Chart.yaml
+++ charts/Chart.yaml
@@ -1,6 +1,6 @@
@@ -1,8 +1,8 @@
apiVersion: v2
type: application
-name: snapshot-validation-webhook
+name: rke2-snapshot-validation-webhook
version: 1.7.3
appVersion: "v6.2.2"
version: 1.9.0
-appVersion: "v6.3.1"
+appVersion: "v8.1.0"
icon: https://github.com/piraeusdatastore/piraeus/master/artwork/sandbox-artwork/icon/color.svg
maintainers:
- name: The Piraeus Maintainers
@@ -10,8 +10,6 @@
description: |
Deploys the snapshot-validation-webhook and configures your cluster to validate every `VolumeSnapshot` and
`VolumeSnapshotContent` resource by sending it to the webhook.
-
- NOTE: Please use the snapshot-controller chart instead: it also deploys the validation webhook.
keywords:
- storage
- snapshot
@@ -22,4 +20,3 @@
annotations:
artifacthub.io/recommendations: |
- url: https://artifacthub.io/packages/helm/piraeus-charts/snapshot-controller
-deprecated: true
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- charts-original/templates/deployment.yaml
+++ charts/templates/deployment.yaml
@@ -32,7 +32,7 @@
@@ -35,7 +35,7 @@
- name: {{ .Chart.Name }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
--- charts-original/values.yaml
+++ charts/values.yaml
@@ -6,7 +6,7 @@
port: 8443
@@ -7,7 +7,7 @@
# enableVolumeGroupSnapshotWebhook: true

image:
- repository: registry.k8s.io/sig-storage/snapshot-validation-webhook
+ repository: rancher/mirrored-sig-storage-snapshot-validation-webhook
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: ""
@@ -63,9 +63,16 @@
@@ -65,9 +65,16 @@

resources: {}

Expand All @@ -28,7 +28,7 @@

affinity: {}

@@ -75,3 +82,11 @@
@@ -77,3 +84,11 @@

rbac:
create: true
Expand Down
4 changes: 2 additions & 2 deletions packages/rke2-snapshot-validation-webhook/package.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
url: https://github.com/piraeusdatastore/helm-charts.git
subdirectory: charts/snapshot-validation-webhook
commit: 994dde7e93cda78eaf098e5c39889c95be928b32 # snapshot-validation-webhook-1.7.3
packageVersion: 02
commit: 191804f1d509177b909b3ced07bf924d302debf2 # snapshot-validation-webhook-1.9.0
packageVersion: 00
Loading