(dev-v2.6-archive) Merge pull request #1660 from innobead/longhorn-1.2.3-v2.6

Longhorn 1.2.3 & 1.1.3 for v2.6

(partially cherry picked from commit 8e8c2b12d4)

packages/fleet-agent/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/fleet/releases/download/v0.3.8/fleet-agent-0.3.8.tgz
+url: https://github.com/rancher/fleet/releases/download/v0.3.8-rc3/fleet-agent-0.3.8-rc3.tgz
 version: 100.0.2

packages/fleet-crd/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/fleet/releases/download/v0.3.8/fleet-crd-0.3.8.tgz
+url: https://github.com/rancher/fleet/releases/download/v0.3.8-rc3/fleet-crd-0.3.8-rc3.tgz
 version: 100.0.2

packages/fleet/generated-changes/dependencies/gitjob/dependency.yaml

@@ -1,3 +1,3 @@
 workingDir: ""
-url: https://github.com/rancher/fleet/releases/download/v0.3.8/fleet-0.3.8.tgz
+url: https://github.com/rancher/fleet/releases/download/v0.3.8-rc3/fleet-0.3.8-rc3.tgz
 subdirectory: charts/gitjob

packages/fleet/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/fleet/releases/download/v0.3.8/fleet-0.3.8.tgz
+url: https://github.com/rancher/fleet/releases/download/v0.3.8-rc3/fleet-0.3.8-rc3.tgz
 version: 100.0.2

packages/longhorn-1.1/generated-changes/overlay/crds/crds.yaml

@@ -4,10 +4,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.1.3-rc2
+    helm.sh/chart: longhorn-1.1.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.1.3-rc2
+    app.kubernetes.io/version: v1.1.3
     longhorn-manager: Engine
   name: engines.longhorn.io
 spec:
@@ -60,10 +60,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.1.3-rc2
+    helm.sh/chart: longhorn-1.1.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.1.3-rc2
+    app.kubernetes.io/version: v1.1.3
     longhorn-manager: Replica
   name: replicas.longhorn.io
 spec:
@@ -120,10 +120,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.1.3-rc2
+    helm.sh/chart: longhorn-1.1.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.1.3-rc2
+    app.kubernetes.io/version: v1.1.3
     longhorn-manager: Setting
   name: settings.longhorn.io
 spec:
@@ -157,10 +157,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.1.3-rc2
+    helm.sh/chart: longhorn-1.1.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.1.3-rc2
+    app.kubernetes.io/version: v1.1.3
     longhorn-manager: Volume
   name: volumes.longhorn.io
 spec:
@@ -217,10 +217,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.1.3-rc2
+    helm.sh/chart: longhorn-1.1.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.1.3-rc2
+    app.kubernetes.io/version: v1.1.3
     longhorn-manager: EngineImage
   name: engineimages.longhorn.io
 spec:
@@ -273,10 +273,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.1.3-rc2
+    helm.sh/chart: longhorn-1.1.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.1.3-rc2
+    app.kubernetes.io/version: v1.1.3
     longhorn-manager: Node
   name: nodes.longhorn.io
 spec:
@@ -325,10 +325,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.1.3-rc2
+    helm.sh/chart: longhorn-1.1.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.1.3-rc2
+    app.kubernetes.io/version: v1.1.3
     longhorn-manager: InstanceManager
   name: instancemanagers.longhorn.io
 spec:
@@ -377,10 +377,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.1.3-rc2
+    helm.sh/chart: longhorn-1.1.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.1.3-rc2
+    app.kubernetes.io/version: v1.1.3
     longhorn-manager: ShareManager
   name: sharemanagers.longhorn.io
 spec:
@@ -425,10 +425,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.1.3-rc2
+    helm.sh/chart: longhorn-1.1.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.1.3-rc2
+    app.kubernetes.io/version: v1.1.3
     longhorn-manager: BackingImage
   name: backingimages.longhorn.io
 spec:
@@ -469,10 +469,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.1.3-rc2
+    helm.sh/chart: longhorn-1.1.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.1.3-rc2
+    app.kubernetes.io/version: v1.1.3
     longhorn-manager: BackingImageManager
   name: backingimagemanagers.longhorn.io
 spec:

packages/longhorn-1.1/generated-changes/patch/Chart.yaml.patch

@@ -16,5 +16,5 @@
 +  catalog.cattle.io/auto-install: longhorn-crd=match
 +  catalog.cattle.io/rancher-version: ">= 2.6.0-0"
 +  catalog.cattle.io/kube-version: ">= v1.16.0-0, < v1.22.0-0"
-+  catalog.cattle.io/upstream-version: 1.1.3-rc3
++  catalog.cattle.io/upstream-version: 1.1.3
 \ No newline at end of file

packages/longhorn-1.1/generated-changes/patch/values.yaml.patch

@@ -6,15 +6,15 @@
      engine:
 -      repository: longhornio/longhorn-engine
 +      repository: rancher/mirrored-longhornio-longhorn-engine
-       tag: v1.1.3-rc3
+       tag: v1.1.3
      manager:
 -      repository: longhornio/longhorn-manager
 +      repository: rancher/mirrored-longhornio-longhorn-manager
-       tag: v1.1.3-rc3
+       tag: v1.1.3
      ui:
 -      repository: longhornio/longhorn-ui
 +      repository: rancher/mirrored-longhornio-longhorn-ui
-       tag: v1.1.3-rc3
+       tag: v1.1.3
      instanceManager:
 -      repository: longhornio/longhorn-instance-manager
 +      repository: rancher/mirrored-longhornio-longhorn-instance-manager

packages/longhorn-1.1/package.yaml

@@ -1,6 +1,6 @@
 url: https://github.com/longhorn/charts.git
 subdirectory: charts/longhorn
-commit: 79f6c629f999029d981a711c15e7698a89f97d65
+commit: b7c0b7177f8bddcfc4b338c20ed46632973ba8e9
 version: 100.0.1
 additionalCharts:
   - workingDir: charts-crd

packages/longhorn-1.1/templates/crd-template/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 1.1.3-rc3
+version: 1.1.3
 description: Installs the CRDs for longhorn.
 name: longhorn-crd
 type: application

packages/longhorn-1.2/generated-changes/overlay/crds/crds.yaml

@@ -3,10 +3,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.2.0
+    helm.sh/chart: longhorn-1.2.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.2.0
+    app.kubernetes.io/version: v1.2.3
     longhorn-manager: Engine
   name: engines.longhorn.io
 spec:
@@ -59,10 +59,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.2.0
+    helm.sh/chart: longhorn-1.2.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.2.0
+    app.kubernetes.io/version: v1.2.3
     longhorn-manager: Replica
   name: replicas.longhorn.io
 spec:
@@ -119,10 +119,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.2.0
+    helm.sh/chart: longhorn-1.2.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.2.0
+    app.kubernetes.io/version: v1.2.3
     longhorn-manager: Setting
   name: settings.longhorn.io
 spec:
@@ -156,10 +156,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.2.0
+    helm.sh/chart: longhorn-1.2.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.2.0
+    app.kubernetes.io/version: v1.2.3
     longhorn-manager: Volume
   name: volumes.longhorn.io
 spec:
@@ -216,10 +216,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.2.0
+    helm.sh/chart: longhorn-1.2.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.2.0
+    app.kubernetes.io/version: v1.2.3
     longhorn-manager: EngineImage
   name: engineimages.longhorn.io
 spec:
@@ -272,10 +272,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.2.0
+    helm.sh/chart: longhorn-1.2.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.2.0
+    app.kubernetes.io/version: v1.2.3
     longhorn-manager: Node
   name: nodes.longhorn.io
 spec:
@@ -324,10 +324,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.2.0
+    helm.sh/chart: longhorn-1.2.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.2.0
+    app.kubernetes.io/version: v1.2.3
     longhorn-manager: InstanceManager
   name: instancemanagers.longhorn.io
 spec:
@@ -376,10 +376,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.2.0
+    helm.sh/chart: longhorn-1.2.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.2.0
+    app.kubernetes.io/version: v1.2.3
     longhorn-manager: ShareManager
   name: sharemanagers.longhorn.io
 spec:
@@ -424,10 +424,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.2.0
+    helm.sh/chart: longhorn-1.2.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.2.0
+    app.kubernetes.io/version: v1.2.3
     longhorn-manager: BackingImage
   name: backingimages.longhorn.io
 spec:
@@ -468,10 +468,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.2.0
+    helm.sh/chart: longhorn-1.2.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.2.0
+    app.kubernetes.io/version: v1.2.3
     longhorn-manager: BackingImageManager
   name: backingimagemanagers.longhorn.io
 spec:
@@ -528,10 +528,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.2.0
+    helm.sh/chart: longhorn-1.2.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.2.0
+    app.kubernetes.io/version: v1.2.3
     longhorn-manager: BackingImageDataSource
   name: backingimagedatasources.longhorn.io
 spec:
@@ -584,10 +584,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.2.0
+    helm.sh/chart: longhorn-1.2.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.2.0
+    app.kubernetes.io/version: v1.2.3
     longhorn-manager: BackupTarget
   name: backuptargets.longhorn.io
 spec:
@@ -641,10 +641,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.2.0
+    helm.sh/chart: longhorn-1.2.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.2.0
+    app.kubernetes.io/version: v1.2.3
     longhorn-manager: BackupVolume
   name: backupvolumes.longhorn.io
 spec:
@@ -694,10 +694,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.2.0
+    helm.sh/chart: longhorn-1.2.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.2.0
+    app.kubernetes.io/version: v1.2.3
     longhorn-manager: Backup
   name: backups.longhorn.io
 spec:
@@ -751,10 +751,10 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: longhorn
-    helm.sh/chart: longhorn-1.2.0
+    helm.sh/chart: longhorn-1.2.3
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: longhorn
-    app.kubernetes.io/version: v1.2.0
+    app.kubernetes.io/version: v1.2.3
     longhorn-manager: RecurringJob
   name: recurringjobs.longhorn.io
 spec:

packages/longhorn-1.2/generated-changes/patch/Chart.yaml.patch

@@ -14,7 +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.3-0"
++  catalog.cattle.io/rancher-version: ">= 2.6.0-0"
 +  catalog.cattle.io/kube-version: ">=1.18.0-0"
-+  catalog.cattle.io/upstream-version: 1.2.3-rc2
++  catalog.cattle.io/upstream-version: 1.2.3
 \ No newline at end of file

packages/longhorn-1.2/generated-changes/patch/values.yaml.patch

@@ -6,15 +6,15 @@
      engine:
 -      repository: longhornio/longhorn-engine
 +      repository: rancher/mirrored-longhornio-longhorn-engine
-       tag: v1.2.3-rc2
+       tag: v1.2.3
      manager:
 -      repository: longhornio/longhorn-manager
 +      repository: rancher/mirrored-longhornio-longhorn-manager
-       tag: v1.2.3-rc2
+       tag: v1.2.3
      ui:
 -      repository: longhornio/longhorn-ui
 +      repository: rancher/mirrored-longhornio-longhorn-ui
-       tag: v1.2.3-rc2
+       tag: v1.2.3
      instanceManager:
 -      repository: longhornio/longhorn-instance-manager
 +      repository: rancher/mirrored-longhornio-longhorn-instance-manager

packages/longhorn-1.2/package.yaml

@@ -1,6 +1,6 @@
 url: https://github.com/longhorn/charts.git
 subdirectory: charts/longhorn
-commit: 693896d59ca31ed4f87d6f6bc48d8a0672850e68
+commit: d699089b1a62011c9cdeb6e8dacba203f30655a8
 version: 100.1.1
 additionalCharts:
 - workingDir: charts-crd

packages/longhorn-1.2/templates/crd-template/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 1.2.3-rc2
+version: 1.2.3
 description: Installs the CRDs for longhorn.
 name: longhorn-crd
 type: application