From 578e592f4772e93e3d33c14fee92474c611eb1e4 Mon Sep 17 00:00:00 2001 From: David Ko Date: Mon, 29 Nov 2021 13:31:07 +0800 Subject: [PATCH] (dev-v2.6-archive) Update generated-changes longhorn 1.2.3 Signed-off-by: David Ko (partially cherry picked from commit 6f14dabef6fa6845305174f6ecf033b9e2e0f083) --- .../generated-changes/patch/Chart.yaml.patch | 7 +- .../patch/questions.yml.patch | 101 ++++++++++++++++++ .../generated-changes/patch/values.yaml.patch | 52 +++++++++ .../templates/crd-template/Chart.yaml | 2 +- 4 files changed, 159 insertions(+), 3 deletions(-) create mode 100644 packages/longhorn-1.2/generated-changes/patch/questions.yml.patch create mode 100644 packages/longhorn-1.2/generated-changes/patch/values.yaml.patch diff --git a/packages/longhorn-1.2/generated-changes/patch/Chart.yaml.patch b/packages/longhorn-1.2/generated-changes/patch/Chart.yaml.patch index 2914654d4..b904fe6e1 100644 --- a/packages/longhorn-1.2/generated-changes/patch/Chart.yaml.patch +++ b/packages/longhorn-1.2/generated-changes/patch/Chart.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/Chart.yaml +++ charts/Chart.yaml -@@ -26,3 +26,14 @@ +@@ -26,3 +26,16 @@ - name: Longhorn maintainers email: maintainers@longhorn.io icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/longhorn/icon/color/longhorn-icon-color.png @@ -14,4 +14,7 @@ + catalog.cattle.io/display-name: "Longhorn" + catalog.cattle.io/os: linux + catalog.cattle.io/auto-install: longhorn-crd=match -+ catalog.cattle.io/rancher-version: '>= 2.6.0-0' ++ catalog.cattle.io/rancher-version: ">= 2.6.3-0" ++ catalog.cattle.io/kube-version: ">=1.18.0-0" ++ catalog.cattle.io/upstream-version: 1.2.3-rc2 +\ No newline at end of file diff --git a/packages/longhorn-1.2/generated-changes/patch/questions.yml.patch b/packages/longhorn-1.2/generated-changes/patch/questions.yml.patch new file mode 100644 index 000000000..123818632 --- /dev/null +++ b/packages/longhorn-1.2/generated-changes/patch/questions.yml.patch @@ -0,0 +1,101 @@ +--- charts-original/questions.yml ++++ charts/questions.yml +@@ -11,7 +11,7 @@ + group: "Longhorn Images" + subquestions: + - variable: image.longhorn.manager.repository +- default: longhornio/longhorn-manager ++ default: rancher/mirrored-longhornio-longhorn-manager + description: "Specify Longhorn Manager Image Repository" + type: string + label: Longhorn Manager Image Repository +@@ -23,7 +23,7 @@ + label: Longhorn Manager Image Tag + group: "Longhorn Images Settings" + - variable: image.longhorn.engine.repository +- default: longhornio/longhorn-engine ++ default: rancher/mirrored-longhornio-longhorn-engine + description: "Specify Longhorn Engine Image Repository" + type: string + label: Longhorn Engine Image Repository +@@ -35,7 +35,7 @@ + label: Longhorn Engine Image Tag + group: "Longhorn Images Settings" + - variable: image.longhorn.ui.repository +- default: longhornio/longhorn-ui ++ default: rancher/mirrored-longhornio-longhorn-ui + description: "Specify Longhorn UI Image Repository" + type: string + label: Longhorn UI Image Repository +@@ -47,7 +47,7 @@ + label: Longhorn UI Image Tag + group: "Longhorn Images Settings" + - variable: image.longhorn.instanceManager.repository +- default: longhornio/longhorn-instance-manager ++ default: rancher/mirrored-longhornio-longhorn-instance-manager + description: "Specify Longhorn Instance Manager Image Repository" + type: string + label: Longhorn Instance Manager Image Repository +@@ -59,7 +59,7 @@ + label: Longhorn Instance Manager Image Tag + group: "Longhorn Images Settings" + - variable: image.longhorn.shareManager.repository +- default: longhornio/longhorn-share-manager ++ default: rancher/mirrored-longhornio-longhorn-share-manager + description: "Specify Longhorn Share Manager Image Repository" + type: string + label: Longhorn Share Manager Image Repository +@@ -71,7 +71,7 @@ + label: Longhorn Share Manager Image Tag + group: "Longhorn Images Settings" + - variable: image.longhorn.backingImageManager.repository +- default: longhornio/backing-image-manager ++ default: rancher/mirrored-longhornio-backing-image-manager + description: "Specify Longhorn Backing Image Manager Image Repository" + type: string + label: Longhorn Backing Image Manager Image Repository +@@ -83,7 +83,7 @@ + label: Longhorn Backing Image Manager Image Tag + group: "Longhorn Images Settings" + - variable: image.csi.attacher.repository +- default: longhornio/csi-attacher ++ default: rancher/mirrored-longhornio-csi-attacher + description: "Specify CSI attacher image repository. Leave blank to autodetect." + type: string + label: Longhorn CSI Attacher Image Repository +@@ -95,7 +95,7 @@ + label: Longhorn CSI Attacher Image Tag + group: "Longhorn CSI Driver Images" + - variable: image.csi.provisioner.repository +- default: longhornio/csi-provisioner ++ default: rancher/mirrored-longhornio-csi-provisioner + description: "Specify CSI provisioner image repository. Leave blank to autodetect." + type: string + label: Longhorn CSI Provisioner Image Repository +@@ -107,7 +107,7 @@ + label: Longhorn CSI Provisioner Image Tag + group: "Longhorn CSI Driver Images" + - variable: image.csi.nodeDriverRegistrar.repository +- default: longhornio/csi-node-driver-registrar ++ default: rancher/mirrored-longhornio-csi-node-driver-registrar + description: "Specify CSI Node Driver Registrar image repository. Leave blank to autodetect." + type: string + label: Longhorn CSI Node Driver Registrar Image Repository +@@ -119,7 +119,7 @@ + label: Longhorn CSI Node Driver Registrar Image Tag + group: "Longhorn CSI Driver Images" + - variable: image.csi.resizer.repository +- default: longhornio/csi-resizer ++ default: rancher/mirrored-longhornio-csi-resizer + description: "Specify CSI Driver Resizer image repository. Leave blank to autodetect." + type: string + label: Longhorn CSI Driver Resizer Image Repository +@@ -131,7 +131,7 @@ + label: Longhorn CSI Driver Resizer Image Tag + group: "Longhorn CSI Driver Images" + - variable: image.csi.snapshotter.repository +- default: longhornio/csi-snapshotter ++ default: rancher/mirrored-longhornio-csi-snapshotter + description: "Specify CSI Driver Snapshotter image repository. Leave blank to autodetect." + type: string + label: Longhorn CSI Driver Snapshotter Image Repository diff --git a/packages/longhorn-1.2/generated-changes/patch/values.yaml.patch b/packages/longhorn-1.2/generated-changes/patch/values.yaml.patch new file mode 100644 index 000000000..41dd4ee33 --- /dev/null +++ b/packages/longhorn-1.2/generated-changes/patch/values.yaml.patch @@ -0,0 +1,52 @@ +--- charts-original/values.yaml ++++ charts/values.yaml +@@ -8,38 +8,38 @@ + image: + longhorn: + engine: +- repository: longhornio/longhorn-engine ++ repository: rancher/mirrored-longhornio-longhorn-engine + tag: v1.2.3-rc2 + manager: +- repository: longhornio/longhorn-manager ++ repository: rancher/mirrored-longhornio-longhorn-manager + tag: v1.2.3-rc2 + ui: +- repository: longhornio/longhorn-ui ++ repository: rancher/mirrored-longhornio-longhorn-ui + tag: v1.2.3-rc2 + instanceManager: +- repository: longhornio/longhorn-instance-manager ++ repository: rancher/mirrored-longhornio-longhorn-instance-manager + tag: v1_20211210 + shareManager: +- repository: longhornio/longhorn-share-manager ++ repository: rancher/mirrored-longhornio-longhorn-share-manager + tag: v1_20211020 + backingImageManager: +- repository: longhornio/backing-image-manager ++ repository: rancher/mirrored-longhornio-backing-image-manager + tag: v2_20210820 + csi: + attacher: +- repository: longhornio/csi-attacher ++ repository: rancher/mirrored-longhornio-csi-attacher + tag: v3.2.1 + provisioner: +- repository: longhornio/csi-provisioner ++ repository: rancher/mirrored-longhornio-csi-provisioner + tag: v2.1.2 + nodeDriverRegistrar: +- repository: longhornio/csi-node-driver-registrar ++ repository: rancher/mirrored-longhornio-csi-node-driver-registrar + tag: v2.3.0 + resizer: +- repository: longhornio/csi-resizer ++ repository: rancher/mirrored-longhornio-csi-resizer + tag: v1.2.0 + snapshotter: +- repository: longhornio/csi-snapshotter ++ repository: rancher/mirrored-longhornio-csi-snapshotter + tag: v3.0.3 + pullPolicy: IfNotPresent + diff --git a/packages/longhorn-1.2/templates/crd-template/Chart.yaml b/packages/longhorn-1.2/templates/crd-template/Chart.yaml index 6423cd808..a46641c71 100644 --- a/packages/longhorn-1.2/templates/crd-template/Chart.yaml +++ b/packages/longhorn-1.2/templates/crd-template/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -version: 1.2.2 +version: 1.2.3-rc2 description: Installs the CRDs for longhorn. name: longhorn-crd type: application