mirror of https://git.rancher.io/rke2-charts
Update snapshot-controller chart and CRDs
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>pull/590/head
Brad Davidson
Brad Davidson
parent
df00d67b98
commit
847cd3f242
|
|
@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||||
kind: CustomResourceDefinition
|
kind: CustomResourceDefinition
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/814"
|
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/1150"
|
||||||
controller-gen.kubebuilder.io/version: v0.15.0
|
controller-gen.kubebuilder.io/version: v0.15.0
|
||||||
name: volumegroupsnapshotclasses.groupsnapshot.storage.k8s.io
|
name: volumegroupsnapshotclasses.groupsnapshot.storage.k8s.io
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -31,7 +31,7 @@ spec:
|
||||||
- jsonPath: .metadata.creationTimestamp
|
- jsonPath: .metadata.creationTimestamp
|
||||||
name: Age
|
name: Age
|
||||||
type: date
|
type: date
|
||||||
name: v1alpha1
|
name: v1beta1
|
||||||
schema:
|
schema:
|
||||||
openAPIV3Schema:
|
openAPIV3Schema:
|
||||||
description: |-
|
description: |-
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||||
kind: CustomResourceDefinition
|
kind: CustomResourceDefinition
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/1068"
|
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/1150"
|
||||||
controller-gen.kubebuilder.io/version: v0.15.0
|
controller-gen.kubebuilder.io/version: v0.15.0
|
||||||
name: volumegroupsnapshotcontents.groupsnapshot.storage.k8s.io
|
name: volumegroupsnapshotcontents.groupsnapshot.storage.k8s.io
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -53,7 +53,7 @@ spec:
|
||||||
- jsonPath: .metadata.creationTimestamp
|
- jsonPath: .metadata.creationTimestamp
|
||||||
name: Age
|
name: Age
|
||||||
type: date
|
type: date
|
||||||
name: v1alpha1
|
name: v1beta1
|
||||||
schema:
|
schema:
|
||||||
openAPIV3Schema:
|
openAPIV3Schema:
|
||||||
description: |-
|
description: |-
|
||||||
|
|
@ -237,8 +237,6 @@ spec:
|
||||||
- message: both volumeGroupSnapshotRef.name and volumeGroupSnapshotRef.namespace
|
- message: both volumeGroupSnapshotRef.name and volumeGroupSnapshotRef.namespace
|
||||||
must be set
|
must be set
|
||||||
rule: has(self.name) && has(self.__namespace__)
|
rule: has(self.name) && has(self.__namespace__)
|
||||||
- message: volumeGroupSnapshotRef is immutable
|
|
||||||
rule: self == oldSelf
|
|
||||||
required:
|
required:
|
||||||
- deletionPolicy
|
- deletionPolicy
|
||||||
- driver
|
- driver
|
||||||
|
|
@ -257,8 +255,9 @@ spec:
|
||||||
The format of this field is a Unix nanoseconds time encoded as an int64.
|
The format of this field is a Unix nanoseconds time encoded as an int64.
|
||||||
On Unix, the command date +%s%N returns the current time in nanoseconds
|
On Unix, the command date +%s%N returns the current time in nanoseconds
|
||||||
since 1970-01-01 00:00:00 UTC.
|
since 1970-01-01 00:00:00 UTC.
|
||||||
format: int64
|
This field is the source for the CreationTime field in VolumeGroupSnapshotStatus
|
||||||
type: integer
|
format: date-time
|
||||||
|
type: string
|
||||||
error:
|
error:
|
||||||
description: |-
|
description: |-
|
||||||
Error is the last observed error during group snapshot creation, if any.
|
Error is the last observed error during group snapshot creation, if any.
|
||||||
|
|
@ -276,42 +275,6 @@ spec:
|
||||||
format: date-time
|
format: date-time
|
||||||
type: string
|
type: string
|
||||||
type: object
|
type: object
|
||||||
pvVolumeSnapshotContentList:
|
|
||||||
description: |-
|
|
||||||
PVVolumeSnapshotContentList is the list of pairs of PV and
|
|
||||||
VolumeSnapshotContent for this group snapshot
|
|
||||||
The maximum number of allowed snapshots in the group is 100.
|
|
||||||
items:
|
|
||||||
description: |-
|
|
||||||
PVVolumeSnapshotContentPair represent a pair of PV names and
|
|
||||||
VolumeSnapshotContent names
|
|
||||||
properties:
|
|
||||||
persistentVolumeRef:
|
|
||||||
description: PersistentVolumeRef is a reference to the persistent
|
|
||||||
volume resource
|
|
||||||
properties:
|
|
||||||
name:
|
|
||||||
description: |-
|
|
||||||
Name of the referent.
|
|
||||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
|
||||||
TODO: Add other useful fields. apiVersion, kind, uid?
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
x-kubernetes-map-type: atomic
|
|
||||||
volumeSnapshotContentRef:
|
|
||||||
description: VolumeSnapshotContentRef is a reference to the
|
|
||||||
volume snapshot content resource
|
|
||||||
properties:
|
|
||||||
name:
|
|
||||||
description: |-
|
|
||||||
Name of the referent.
|
|
||||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
|
||||||
TODO: Add other useful fields. apiVersion, kind, uid?
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
x-kubernetes-map-type: atomic
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
readyToUse:
|
readyToUse:
|
||||||
description: |-
|
description: |-
|
||||||
ReadyToUse indicates if all the individual snapshots in the group are ready to be
|
ReadyToUse indicates if all the individual snapshots in the group are ready to be
|
||||||
|
|
@ -325,6 +288,32 @@ spec:
|
||||||
If a storage system does not provide such an id, the
|
If a storage system does not provide such an id, the
|
||||||
CSI driver can choose to return the VolumeGroupSnapshot name.
|
CSI driver can choose to return the VolumeGroupSnapshot name.
|
||||||
type: string
|
type: string
|
||||||
|
volumeSnapshotHandlePairList:
|
||||||
|
description: |-
|
||||||
|
VolumeSnapshotHandlePairList is a list of CSI "volume_id" and "snapshot_id"
|
||||||
|
pair returned by the CSI driver to identify snapshots and their source volumes
|
||||||
|
on the storage system.
|
||||||
|
items:
|
||||||
|
description: VolumeSnapshotHandlePair defines a pair of a source
|
||||||
|
volume handle and a snapshot handle
|
||||||
|
properties:
|
||||||
|
snapshotHandle:
|
||||||
|
description: |-
|
||||||
|
SnapshotHandle is a unique id returned by the CSI driver to identify a volume
|
||||||
|
snapshot on the storage system
|
||||||
|
Required.
|
||||||
|
type: string
|
||||||
|
volumeHandle:
|
||||||
|
description: |-
|
||||||
|
VolumeHandle is a unique id returned by the CSI driver to identify a volume
|
||||||
|
on the storage system
|
||||||
|
Required.
|
||||||
|
type: string
|
||||||
|
required:
|
||||||
|
- snapshotHandle
|
||||||
|
- volumeHandle
|
||||||
|
type: object
|
||||||
|
type: array
|
||||||
type: object
|
type: object
|
||||||
required:
|
required:
|
||||||
- spec
|
- spec
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||||
kind: CustomResourceDefinition
|
kind: CustomResourceDefinition
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/1068"
|
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/1150"
|
||||||
controller-gen.kubebuilder.io/version: v0.15.0
|
controller-gen.kubebuilder.io/version: v0.15.0
|
||||||
name: volumegroupsnapshots.groupsnapshot.storage.k8s.io
|
name: volumegroupsnapshots.groupsnapshot.storage.k8s.io
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -43,7 +43,7 @@ spec:
|
||||||
- jsonPath: .metadata.creationTimestamp
|
- jsonPath: .metadata.creationTimestamp
|
||||||
name: Age
|
name: Age
|
||||||
type: date
|
type: date
|
||||||
name: v1alpha1
|
name: v1beta1
|
||||||
schema:
|
schema:
|
||||||
openAPIV3Schema:
|
openAPIV3Schema:
|
||||||
description: |-
|
description: |-
|
||||||
|
|
@ -198,6 +198,7 @@ spec:
|
||||||
The format of this field is a Unix nanoseconds time encoded as an int64.
|
The format of this field is a Unix nanoseconds time encoded as an int64.
|
||||||
On Unix, the command date +%s%N returns the current time in nanoseconds
|
On Unix, the command date +%s%N returns the current time in nanoseconds
|
||||||
since 1970-01-01 00:00:00 UTC.
|
since 1970-01-01 00:00:00 UTC.
|
||||||
|
This field is updated based on the CreationTime field in VolumeGroupSnapshotContentStatus
|
||||||
format: date-time
|
format: date-time
|
||||||
type: string
|
type: string
|
||||||
error:
|
error:
|
||||||
|
|
@ -221,41 +222,6 @@ spec:
|
||||||
format: date-time
|
format: date-time
|
||||||
type: string
|
type: string
|
||||||
type: object
|
type: object
|
||||||
pvcVolumeSnapshotRefList:
|
|
||||||
description: |-
|
|
||||||
VolumeSnapshotRefList is the list of PVC and VolumeSnapshot pairs that
|
|
||||||
is part of this group snapshot.
|
|
||||||
The maximum number of allowed snapshots in the group is 100.
|
|
||||||
items:
|
|
||||||
description: PVCVolumeSnapshotPair defines a pair of a PVC reference
|
|
||||||
and a Volume Snapshot Reference
|
|
||||||
properties:
|
|
||||||
persistentVolumeClaimRef:
|
|
||||||
description: PersistentVolumeClaimRef is a reference to the
|
|
||||||
PVC this pair is referring to
|
|
||||||
properties:
|
|
||||||
name:
|
|
||||||
description: |-
|
|
||||||
Name of the referent.
|
|
||||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
|
||||||
TODO: Add other useful fields. apiVersion, kind, uid?
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
x-kubernetes-map-type: atomic
|
|
||||||
volumeSnapshotRef:
|
|
||||||
description: VolumeSnapshotRef is a reference to the VolumeSnapshot
|
|
||||||
this pair is referring to
|
|
||||||
properties:
|
|
||||||
name:
|
|
||||||
description: |-
|
|
||||||
Name of the referent.
|
|
||||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
|
||||||
TODO: Add other useful fields. apiVersion, kind, uid?
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
x-kubernetes-map-type: atomic
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
readyToUse:
|
readyToUse:
|
||||||
description: |-
|
description: |-
|
||||||
ReadyToUse indicates if all the individual snapshots in the group are ready
|
ReadyToUse indicates if all the individual snapshots in the group are ready
|
||||||
|
|
|
||||||
|
|
@ -132,7 +132,7 @@ spec:
|
||||||
- deletionPolicy
|
- deletionPolicy
|
||||||
- driver
|
- driver
|
||||||
type: object
|
type: object
|
||||||
served: true
|
served: false
|
||||||
storage: false
|
storage: false
|
||||||
subresources: {}
|
subresources: {}
|
||||||
status:
|
status:
|
||||||
|
|
|
||||||
|
|
@ -445,7 +445,7 @@ spec:
|
||||||
required:
|
required:
|
||||||
- spec
|
- spec
|
||||||
type: object
|
type: object
|
||||||
served: true
|
served: false
|
||||||
storage: false
|
storage: false
|
||||||
subresources:
|
subresources:
|
||||||
status: {}
|
status: {}
|
||||||
|
|
|
||||||
|
|
@ -339,7 +339,7 @@ spec:
|
||||||
required:
|
required:
|
||||||
- spec
|
- spec
|
||||||
type: object
|
type: object
|
||||||
served: true
|
served: false
|
||||||
storage: false
|
storage: false
|
||||||
subresources:
|
subresources:
|
||||||
status: {}
|
status: {}
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,6 @@
|
||||||
type: application
|
type: application
|
||||||
-name: snapshot-controller
|
-name: snapshot-controller
|
||||||
+name: rke2-snapshot-controller
|
+name: rke2-snapshot-controller
|
||||||
version: 3.0.6
|
version: 4.0.0
|
||||||
appVersion: "v8.1.0"
|
appVersion: "v8.2.0"
|
||||||
kubeVersion: ">= 1.25.0-0"
|
kubeVersion: ">= 1.25.0-0"
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
--- charts-original/templates/_helpers.tpl
|
--- charts-original/templates/_helpers.tpl
|
||||||
+++ charts/templates/_helpers.tpl
|
+++ charts/templates/_helpers.tpl
|
||||||
@@ -132,3 +132,11 @@
|
@@ -59,3 +59,11 @@
|
||||||
{{- include "snapshot-validation-webhook.fullname" . }}-tls
|
{{ default "default" .Values.controller.serviceAccount.name }}
|
||||||
{{- end }}
|
{{- end -}}
|
||||||
{{- end }}
|
{{- end -}}
|
||||||
+
|
+
|
||||||
+{{- define "system_default_registry" -}}
|
+{{- define "system_default_registry" -}}
|
||||||
+{{- if .Values.global.systemDefaultRegistry -}}
|
+{{- if .Values.global.systemDefaultRegistry -}}
|
||||||
|
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
--- 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 }}
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
image:
|
image:
|
||||||
- repository: registry.k8s.io/sig-storage/snapshot-controller
|
- repository: registry.k8s.io/sig-storage/snapshot-controller
|
||||||
+ repository: rancher/mirrored-sig-storage-snapshot-controller
|
+ repository: rancher/mirrored-sig-storage-snapshot-validation-webhook
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
# Overrides the image tag whose default is the chart appVersion.
|
# Overrides the image tag whose default is the chart appVersion.
|
||||||
tag: ""
|
tag: ""
|
||||||
|
|
@ -28,61 +28,10 @@
|
||||||
|
|
||||||
affinity: {}
|
affinity: {}
|
||||||
|
|
||||||
@@ -82,7 +89,7 @@
|
@@ -80,3 +87,6 @@
|
||||||
|
# DNS Policy for controller pod. For Pods running with hostNetwork, set to `ClusterFirstWithHostNet`
|
||||||
|
# For further reference: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy.
|
||||||
dnsPolicy: ClusterFirst
|
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:
|
+global:
|
||||||
+ systemDefaultRegistry: ""
|
+ systemDefaultRegistry: ""
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
url: https://github.com/piraeusdatastore/helm-charts.git
|
url: https://github.com/piraeusdatastore/helm-charts.git
|
||||||
subdirectory: charts/snapshot-controller
|
subdirectory: charts/snapshot-controller
|
||||||
commit: 79c15f2317860baf58fa70d00ff355a631a77206 # snapshot-controller-3.0.6
|
commit: caf8780858bdd5afe1d80fe2f559ca138f29740e # snapshot-controller-4.0.0
|
||||||
packageVersion: 01
|
packageVersion: 01
|
||||||
additionalCharts:
|
additionalCharts:
|
||||||
- workingDir: charts-crd
|
- workingDir: charts-crd
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
version: 3.0.6
|
version: 4.0.0
|
||||||
appVersion: "v8.1.0"
|
appVersion: "v8.2.0"
|
||||||
description: Installs the CRDs for rke2-snapshot-controller
|
description: Installs the CRDs for rke2-snapshot-controller
|
||||||
name: rke2-snapshot-controller-crd
|
name: rke2-snapshot-controller-crd
|
||||||
type: application
|
type: application
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue