From 9e93598d140ca41de18fdde6bd39daa79644bbac Mon Sep 17 00:00:00 2001 From: David Ko Date: Thu, 16 Sep 2021 15:57:04 +0800 Subject: [PATCH] (dev-v2.6-archive) Update longhorn 1.2.0 Signed-off-by: David Ko (partially cherry picked from commit 7507442ef7a56e0858b60dc1421d733b308345ff) --- packages/fleet-agent/package.yaml | 2 +- packages/fleet-crd/package.yaml | 2 +- .../dependencies/gitjob/dependency.yaml | 2 +- packages/fleet/package.yaml | 2 +- .../exclude/templates/crds.yaml | 0 .../generated-changes/overlay/crds/crds.yaml | 0 .../overlay/templates/userroles.yaml | 0 .../generated-changes/patch/Chart.yaml.patch | 3 +- .../generated-changes/patch/README.md.patch | 0 .../patch/questions.yml.patch | 0 .../generated-changes/patch/values.yaml.patch | 0 .../{longhorn => longhorn-1.1}/package.yaml | 0 .../templates/crd-template/Chart.yaml | 0 .../templates/crd-template/README.md | 0 .../exclude/templates/crds.yaml | 758 ++++++++++++++++ .../generated-changes/overlay/crds/crds.yaml | 832 ++++++++++++++++++ .../overlay/templates/userroles.yaml | 47 + .../generated-changes/patch/Chart.yaml.patch | 17 + .../generated-changes/patch/README.md.patch | 47 + .../patch/questions.yml.patch | 101 +++ .../generated-changes/patch/values.yaml.patch | 52 ++ packages/longhorn-1.2/package.yaml | 10 + .../templates/crd-template/Chart.yaml | 10 + .../templates/crd-template/README.md | 2 + .../rancher-aks-operator-crd/package.yaml | 4 +- packages/rancher-aks-operator/package.yaml | 4 +- packages/rancher-backup-crd/package.yaml | 2 +- packages/rancher-backup/package.yaml | 2 +- .../rancher-cis-benchmark/charts/Chart.yaml | 3 +- .../rancher-cis-benchmark/charts/values.yaml | 6 +- packages/rancher-cis-benchmark/package.yaml | 2 +- .../rancher-external-ip-webhook/package.yaml | 2 +- .../generated-changes/patch/Chart.yaml.patch | 12 +- .../gatekeeper-audit-deployment.yaml.patch | 2 +- ...r-controller-manager-deployment.yaml.patch | 2 +- .../templates/upgrade-crds-hook.yaml.patch | 11 - .../generated-changes/patch/values.yaml.patch | 10 +- packages/rancher-gatekeeper/package.yaml | 4 +- .../templates/crd-template/Chart.yaml | 2 +- .../rancher-vsphere-cpi/charts/questions.yaml | 11 + .../charts/templates/vsphere-cpi-ds.yaml | 23 +- .../rancher-vsphere-cpi/charts/values.yaml | 3 + .../vsphere-csi-controller-deployment.yaml | 21 +- packages/rancher-webhook/package.yaml | 4 +- 44 files changed, 1933 insertions(+), 84 deletions(-) rename packages/{longhorn => longhorn-1.1}/generated-changes/exclude/templates/crds.yaml (100%) rename packages/{longhorn => longhorn-1.1}/generated-changes/overlay/crds/crds.yaml (100%) rename packages/{longhorn => longhorn-1.1}/generated-changes/overlay/templates/userroles.yaml (100%) rename packages/{longhorn => longhorn-1.1}/generated-changes/patch/Chart.yaml.patch (90%) rename packages/{longhorn => longhorn-1.1}/generated-changes/patch/README.md.patch (100%) rename packages/{longhorn => longhorn-1.1}/generated-changes/patch/questions.yml.patch (100%) rename packages/{longhorn => longhorn-1.1}/generated-changes/patch/values.yaml.patch (100%) rename packages/{longhorn => longhorn-1.1}/package.yaml (100%) rename packages/{longhorn => longhorn-1.1}/templates/crd-template/Chart.yaml (100%) rename packages/{longhorn => longhorn-1.1}/templates/crd-template/README.md (100%) create mode 100644 packages/longhorn-1.2/generated-changes/exclude/templates/crds.yaml create mode 100644 packages/longhorn-1.2/generated-changes/overlay/crds/crds.yaml create mode 100644 packages/longhorn-1.2/generated-changes/overlay/templates/userroles.yaml create mode 100644 packages/longhorn-1.2/generated-changes/patch/Chart.yaml.patch create mode 100644 packages/longhorn-1.2/generated-changes/patch/README.md.patch 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 create mode 100644 packages/longhorn-1.2/package.yaml create mode 100644 packages/longhorn-1.2/templates/crd-template/Chart.yaml create mode 100644 packages/longhorn-1.2/templates/crd-template/README.md delete mode 100644 packages/rancher-gatekeeper/generated-changes/patch/templates/upgrade-crds-hook.yaml.patch diff --git a/packages/fleet-agent/package.yaml b/packages/fleet-agent/package.yaml index 51ff11bff..4aa938157 100644 --- a/packages/fleet-agent/package.yaml +++ b/packages/fleet-agent/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/fleet/releases/download/v0.3.6/fleet-agent-0.3.6.tgz +url: https://github.com/rancher/fleet/releases/download/v0.3.6-rc13/fleet-agent-0.3.6-rc13.tgz version: 100.0.0 diff --git a/packages/fleet-crd/package.yaml b/packages/fleet-crd/package.yaml index b1db2a43b..0ca64710d 100644 --- a/packages/fleet-crd/package.yaml +++ b/packages/fleet-crd/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/fleet/releases/download/v0.3.6/fleet-crd-0.3.6.tgz +url: https://github.com/rancher/fleet/releases/download/v0.3.6-rc13/fleet-crd-0.3.6-rc13.tgz version: 100.0.0 diff --git a/packages/fleet/generated-changes/dependencies/gitjob/dependency.yaml b/packages/fleet/generated-changes/dependencies/gitjob/dependency.yaml index d538fe9c7..a0d77ab30 100644 --- a/packages/fleet/generated-changes/dependencies/gitjob/dependency.yaml +++ b/packages/fleet/generated-changes/dependencies/gitjob/dependency.yaml @@ -1,3 +1,3 @@ workingDir: "" -url: https://github.com/rancher/fleet/releases/download/v0.3.6/fleet-0.3.6.tgz +url: https://github.com/rancher/fleet/releases/download/v0.3.6-rc13/fleet-0.3.6-rc13.tgz subdirectory: charts/gitjob diff --git a/packages/fleet/package.yaml b/packages/fleet/package.yaml index bf0696b37..72445140a 100644 --- a/packages/fleet/package.yaml +++ b/packages/fleet/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/fleet/releases/download/v0.3.6/fleet-0.3.6.tgz +url: https://github.com/rancher/fleet/releases/download/v0.3.6-rc13/fleet-0.3.6-rc13.tgz version: 100.0.0 diff --git a/packages/longhorn/generated-changes/exclude/templates/crds.yaml b/packages/longhorn-1.1/generated-changes/exclude/templates/crds.yaml similarity index 100% rename from packages/longhorn/generated-changes/exclude/templates/crds.yaml rename to packages/longhorn-1.1/generated-changes/exclude/templates/crds.yaml diff --git a/packages/longhorn/generated-changes/overlay/crds/crds.yaml b/packages/longhorn-1.1/generated-changes/overlay/crds/crds.yaml similarity index 100% rename from packages/longhorn/generated-changes/overlay/crds/crds.yaml rename to packages/longhorn-1.1/generated-changes/overlay/crds/crds.yaml diff --git a/packages/longhorn/generated-changes/overlay/templates/userroles.yaml b/packages/longhorn-1.1/generated-changes/overlay/templates/userroles.yaml similarity index 100% rename from packages/longhorn/generated-changes/overlay/templates/userroles.yaml rename to packages/longhorn-1.1/generated-changes/overlay/templates/userroles.yaml diff --git a/packages/longhorn/generated-changes/patch/Chart.yaml.patch b/packages/longhorn-1.1/generated-changes/patch/Chart.yaml.patch similarity index 90% rename from packages/longhorn/generated-changes/patch/Chart.yaml.patch rename to packages/longhorn-1.1/generated-changes/patch/Chart.yaml.patch index e2a0874c8..c6ced8d9f 100644 --- a/packages/longhorn/generated-changes/patch/Chart.yaml.patch +++ b/packages/longhorn-1.1/generated-changes/patch/Chart.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/Chart.yaml +++ charts/Chart.yaml -@@ -27,3 +27,13 @@ +@@ -27,3 +27,14 @@ - name: Longhorn maintainers email: maintainers@longhorn.io icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/longhorn/icon/color/longhorn-icon-color.png @@ -14,3 +14,4 @@ + 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' diff --git a/packages/longhorn/generated-changes/patch/README.md.patch b/packages/longhorn-1.1/generated-changes/patch/README.md.patch similarity index 100% rename from packages/longhorn/generated-changes/patch/README.md.patch rename to packages/longhorn-1.1/generated-changes/patch/README.md.patch diff --git a/packages/longhorn/generated-changes/patch/questions.yml.patch b/packages/longhorn-1.1/generated-changes/patch/questions.yml.patch similarity index 100% rename from packages/longhorn/generated-changes/patch/questions.yml.patch rename to packages/longhorn-1.1/generated-changes/patch/questions.yml.patch diff --git a/packages/longhorn/generated-changes/patch/values.yaml.patch b/packages/longhorn-1.1/generated-changes/patch/values.yaml.patch similarity index 100% rename from packages/longhorn/generated-changes/patch/values.yaml.patch rename to packages/longhorn-1.1/generated-changes/patch/values.yaml.patch diff --git a/packages/longhorn/package.yaml b/packages/longhorn-1.1/package.yaml similarity index 100% rename from packages/longhorn/package.yaml rename to packages/longhorn-1.1/package.yaml diff --git a/packages/longhorn/templates/crd-template/Chart.yaml b/packages/longhorn-1.1/templates/crd-template/Chart.yaml similarity index 100% rename from packages/longhorn/templates/crd-template/Chart.yaml rename to packages/longhorn-1.1/templates/crd-template/Chart.yaml diff --git a/packages/longhorn/templates/crd-template/README.md b/packages/longhorn-1.1/templates/crd-template/README.md similarity index 100% rename from packages/longhorn/templates/crd-template/README.md rename to packages/longhorn-1.1/templates/crd-template/README.md diff --git a/packages/longhorn-1.2/generated-changes/exclude/templates/crds.yaml b/packages/longhorn-1.2/generated-changes/exclude/templates/crds.yaml new file mode 100644 index 000000000..4086ef811 --- /dev/null +++ b/packages/longhorn-1.2/generated-changes/exclude/templates/crds.yaml @@ -0,0 +1,758 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: {{- include "longhorn.labels" . | nindent 4 }} + longhorn-manager: Engine + name: engines.longhorn.io +spec: + group: longhorn.io + names: + kind: Engine + listKind: EngineList + plural: engines + shortNames: + - lhe + singular: engine + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: State + type: string + description: The current state of the engine + jsonPath: .status.currentState + - name: Node + type: string + description: The node that the engine is on + jsonPath: .spec.nodeID + - name: InstanceManager + type: string + description: The instance manager of the engine + jsonPath: .status.instanceManagerName + - name: Image + type: string + description: The current image of the engine + jsonPath: .status.currentImage + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: {{- include "longhorn.labels" . | nindent 4 }} + longhorn-manager: Replica + name: replicas.longhorn.io +spec: + group: longhorn.io + names: + kind: Replica + listKind: ReplicaList + plural: replicas + shortNames: + - lhr + singular: replica + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: State + type: string + description: The current state of the replica + jsonPath: .status.currentState + - name: Node + type: string + description: The node that the replica is on + jsonPath: .spec.nodeID + - name: Disk + type: string + description: The disk that the replica is on + jsonPath: .spec.diskID + - name: InstanceManager + type: string + description: The instance manager of the replica + jsonPath: .status.instanceManagerName + - name: Image + type: string + description: The current image of the replica + jsonPath: .status.currentImage + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: {{- include "longhorn.labels" . | nindent 4 }} + longhorn-manager: Setting + name: settings.longhorn.io +spec: + group: longhorn.io + names: + kind: Setting + listKind: SettingList + plural: settings + shortNames: + - lhs + singular: setting + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + x-kubernetes-preserve-unknown-fields: true + additionalPrinterColumns: + - name: Value + type: string + description: The value of the setting + jsonPath: .value + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: {{- include "longhorn.labels" . | nindent 4 }} + longhorn-manager: Volume + name: volumes.longhorn.io +spec: + group: longhorn.io + names: + kind: Volume + listKind: VolumeList + plural: volumes + shortNames: + - lhv + singular: volume + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: State + type: string + description: The state of the volume + jsonPath: .status.state + - name: Robustness + type: string + description: The robustness of the volume + jsonPath: .status.robustness + - name: Scheduled + type: string + description: The scheduled condition of the volume + jsonPath: .status.conditions['scheduled']['status'] + - name: Size + type: string + description: The size of the volume + jsonPath: .spec.size + - name: Node + type: string + description: The node that the volume is currently attaching to + jsonPath: .status.currentNodeID + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: {{- include "longhorn.labels" . | nindent 4 }} + longhorn-manager: EngineImage + name: engineimages.longhorn.io +spec: + group: longhorn.io + names: + kind: EngineImage + listKind: EngineImageList + plural: engineimages + shortNames: + - lhei + singular: engineimage + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: State + type: string + description: State of the engine image + jsonPath: .status.state + - name: Image + type: string + description: The Longhorn engine image + jsonPath: .spec.image + - name: RefCount + type: integer + description: Number of volumes are using the engine image + jsonPath: .status.refCount + - name: BuildDate + type: date + description: The build date of the engine image + jsonPath: .status.buildDate + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: {{- include "longhorn.labels" . | nindent 4 }} + longhorn-manager: Node + name: nodes.longhorn.io +spec: + group: longhorn.io + names: + kind: Node + listKind: NodeList + plural: nodes + shortNames: + - lhn + singular: node + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: Ready + type: string + description: Indicate whether the node is ready + jsonPath: .status.conditions['Ready']['status'] + - name: AllowScheduling + type: boolean + description: Indicate whether the user disabled/enabled replica scheduling for the node + jsonPath: .spec.allowScheduling + - name: Schedulable + type: string + description: Indicate whether Longhorn can schedule replicas on the node + jsonPath: .status.conditions['Schedulable']['status'] + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: {{- include "longhorn.labels" . | nindent 4 }} + longhorn-manager: InstanceManager + name: instancemanagers.longhorn.io +spec: + group: longhorn.io + names: + kind: InstanceManager + listKind: InstanceManagerList + plural: instancemanagers + shortNames: + - lhim + singular: instancemanager + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: State + type: string + description: The state of the instance manager + jsonPath: .status.currentState + - name: Type + type: string + description: The type of the instance manager (engine or replica) + jsonPath: .spec.type + - name: Node + type: string + description: The node that the instance manager is running on + jsonPath: .spec.nodeID + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: {{- include "longhorn.labels" . | nindent 4 }} + longhorn-manager: ShareManager + name: sharemanagers.longhorn.io +spec: + group: longhorn.io + names: + kind: ShareManager + listKind: ShareManagerList + plural: sharemanagers + shortNames: + - lhsm + singular: sharemanager + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: State + type: string + description: The state of the share manager + jsonPath: .status.state + - name: Node + type: string + description: The node that the share manager is owned by + jsonPath: .status.ownerID + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: {{- include "longhorn.labels" . | nindent 4 }} + longhorn-manager: BackingImage + name: backingimages.longhorn.io +spec: + group: longhorn.io + names: + kind: BackingImage + listKind: BackingImageList + plural: backingimages + shortNames: + - lhbi + singular: backingimage + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: Image + type: string + description: The backing image name + jsonPath: .spec.image + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: {{- include "longhorn.labels" . | nindent 4 }} + longhorn-manager: BackingImageManager + name: backingimagemanagers.longhorn.io +spec: + group: longhorn.io + names: + kind: BackingImageManager + listKind: BackingImageManagerList + plural: backingimagemanagers + shortNames: + - lhbim + singular: backingimagemanager + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: State + type: string + description: The current state of the manager + jsonPath: .status.currentState + - name: Image + type: string + description: The image the manager pod will use + jsonPath: .spec.image + - name: Node + type: string + description: The node the manager is on + jsonPath: .spec.nodeID + - name: DiskUUID + type: string + description: The disk the manager is responsible for + jsonPath: .spec.diskUUID + - name: DiskPath + type: string + description: The disk path the manager is using + jsonPath: .spec.diskPath + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: {{- include "longhorn.labels" . | nindent 4 }} + longhorn-manager: BackingImageDataSource + name: backingimagedatasources.longhorn.io +spec: + group: longhorn.io + names: + kind: BackingImageDataSource + listKind: BackingImageDataSourceList + plural: backingimagedatasources + shortNames: + - lhbids + singular: backingimagedatasource + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: State + type: string + description: The current state of the pod used to provisione the backing image file from source + jsonPath: .status.currentState + - name: SourceType + type: string + description: The data source type + jsonPath: .spec.sourceType + - name: Node + type: string + description: The node the backing image file will be prepared on + jsonPath: .spec.nodeID + - name: DiskUUID + type: string + description: The disk the backing image file will be prepared on + jsonPath: .spec.diskUUID + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: {{- include "longhorn.labels" . | nindent 4 }} + longhorn-manager: BackupTarget + name: backuptargets.longhorn.io +spec: + group: longhorn.io + names: + kind: BackupTarget + listKind: BackupTargetList + plural: backuptargets + shortNames: + - lhbt + singular: backuptarget + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: URL + type: string + description: The backup target URL + jsonPath: .spec.backupTargetURL + - name: Credential + type: string + description: The backup target credential secret + jsonPath: .spec.credentialSecret + - name: Interval + type: string + description: The backup target poll interval + jsonPath: .spec.pollInterval + - name: Available + type: boolean + description: Indicate whether the backup target is available or not + jsonPath: .status.available + - name: LastSyncedAt + type: string + description: The backup target last synced time + jsonPath: .status.lastSyncedAt +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: {{- include "longhorn.labels" . | nindent 4 }} + longhorn-manager: BackupVolume + name: backupvolumes.longhorn.io +spec: + group: longhorn.io + names: + kind: BackupVolume + listKind: BackupVolumeList + plural: backupvolumes + shortNames: + - lhbv + singular: backupvolume + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: CreatedAt + type: string + description: The backup volume creation time + jsonPath: .status.createdAt + - name: LastBackupName + type: string + description: The backup volume last backup name + jsonPath: .status.lastBackupName + - name: LastBackupAt + type: string + description: The backup volume last backup time + jsonPath: .status.lastBackupAt + - name: LastSyncedAt + type: string + description: The backup volume last synced time + jsonPath: .status.lastSyncedAt +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: {{- include "longhorn.labels" . | nindent 4 }} + longhorn-manager: Backup + name: backups.longhorn.io +spec: + group: longhorn.io + names: + kind: Backup + listKind: BackupList + plural: backups + shortNames: + - lhb + singular: backup + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: SnapshotName + type: string + description: The snapshot name + jsonPath: .status.snapshotName + - name: SnapshotSize + type: string + description: The snapshot size + jsonPath: .status.size + - name: SnapshotCreatedAt + type: string + description: The snapshot creation time + jsonPath: .status.snapshotCreatedAt + - name: State + type: string + description: The backup state + jsonPath: .status.state + - name: LastSyncedAt + type: string + description: The backup last synced time + jsonPath: .status.lastSyncedAt +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: {{- include "longhorn.labels" . | nindent 4 }} + longhorn-manager: RecurringJob + name: recurringjobs.longhorn.io +spec: + group: longhorn.io + names: + kind: RecurringJob + listKind: RecurringJobList + plural: recurringjobs + shortNames: + - lhrj + singular: recurringjob + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + metadata: + type: object + properties: + name: + type: string + spec: + type: object + properties: + groups: + type: array + items: + type: string + task: + type: string + pattern: "^snapshot|backup$" + cron: + type: string + retain: + type: integer + concurrency: + type: integer + labels: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: Groups + type: string + description: Sets groupings to the jobs. When set to "default" group will be added to the volume label when no other job label exist in volume. + jsonPath: .spec.groups + - name: Task + type: string + description: Should be one of "backup" or "snapshot". + jsonPath: .spec.task + - name: Cron + type: string + description: The cron expression represents recurring job scheduling. + jsonPath: .spec.cron + - name: Retain + type: integer + description: The number of snapshots/backups to keep for the volume. + jsonPath: .spec.retain + - name: Concurrency + type: integer + description: The concurrent job to run by each cron job. + jsonPath: .spec.concurrency + - name: Age + type: date + jsonPath: .metadata.creationTimestamp + - name: Labels + type: string + description: Specify the labels + jsonPath: .spec.labels +--- diff --git a/packages/longhorn-1.2/generated-changes/overlay/crds/crds.yaml b/packages/longhorn-1.2/generated-changes/overlay/crds/crds.yaml new file mode 100644 index 000000000..427a39723 --- /dev/null +++ b/packages/longhorn-1.2/generated-changes/overlay/crds/crds.yaml @@ -0,0 +1,832 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: + app.kubernetes.io/name: longhorn + helm.sh/chart: longhorn-1.2.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: longhorn + app.kubernetes.io/version: v1.2.0 + longhorn-manager: Engine + name: engines.longhorn.io +spec: + group: longhorn.io + names: + kind: Engine + listKind: EngineList + plural: engines + shortNames: + - lhe + singular: engine + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: State + type: string + description: The current state of the engine + jsonPath: .status.currentState + - name: Node + type: string + description: The node that the engine is on + jsonPath: .spec.nodeID + - name: InstanceManager + type: string + description: The instance manager of the engine + jsonPath: .status.instanceManagerName + - name: Image + type: string + description: The current image of the engine + jsonPath: .status.currentImage + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: + app.kubernetes.io/name: longhorn + helm.sh/chart: longhorn-1.2.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: longhorn + app.kubernetes.io/version: v1.2.0 + longhorn-manager: Replica + name: replicas.longhorn.io +spec: + group: longhorn.io + names: + kind: Replica + listKind: ReplicaList + plural: replicas + shortNames: + - lhr + singular: replica + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: State + type: string + description: The current state of the replica + jsonPath: .status.currentState + - name: Node + type: string + description: The node that the replica is on + jsonPath: .spec.nodeID + - name: Disk + type: string + description: The disk that the replica is on + jsonPath: .spec.diskID + - name: InstanceManager + type: string + description: The instance manager of the replica + jsonPath: .status.instanceManagerName + - name: Image + type: string + description: The current image of the replica + jsonPath: .status.currentImage + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: + app.kubernetes.io/name: longhorn + helm.sh/chart: longhorn-1.2.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: longhorn + app.kubernetes.io/version: v1.2.0 + longhorn-manager: Setting + name: settings.longhorn.io +spec: + group: longhorn.io + names: + kind: Setting + listKind: SettingList + plural: settings + shortNames: + - lhs + singular: setting + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + x-kubernetes-preserve-unknown-fields: true + additionalPrinterColumns: + - name: Value + type: string + description: The value of the setting + jsonPath: .value + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: + app.kubernetes.io/name: longhorn + helm.sh/chart: longhorn-1.2.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: longhorn + app.kubernetes.io/version: v1.2.0 + longhorn-manager: Volume + name: volumes.longhorn.io +spec: + group: longhorn.io + names: + kind: Volume + listKind: VolumeList + plural: volumes + shortNames: + - lhv + singular: volume + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: State + type: string + description: The state of the volume + jsonPath: .status.state + - name: Robustness + type: string + description: The robustness of the volume + jsonPath: .status.robustness + - name: Scheduled + type: string + description: The scheduled condition of the volume + jsonPath: .status.conditions['scheduled']['status'] + - name: Size + type: string + description: The size of the volume + jsonPath: .spec.size + - name: Node + type: string + description: The node that the volume is currently attaching to + jsonPath: .status.currentNodeID + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: + app.kubernetes.io/name: longhorn + helm.sh/chart: longhorn-1.2.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: longhorn + app.kubernetes.io/version: v1.2.0 + longhorn-manager: EngineImage + name: engineimages.longhorn.io +spec: + group: longhorn.io + names: + kind: EngineImage + listKind: EngineImageList + plural: engineimages + shortNames: + - lhei + singular: engineimage + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: State + type: string + description: State of the engine image + jsonPath: .status.state + - name: Image + type: string + description: The Longhorn engine image + jsonPath: .spec.image + - name: RefCount + type: integer + description: Number of volumes are using the engine image + jsonPath: .status.refCount + - name: BuildDate + type: date + description: The build date of the engine image + jsonPath: .status.buildDate + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: + app.kubernetes.io/name: longhorn + helm.sh/chart: longhorn-1.2.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: longhorn + app.kubernetes.io/version: v1.2.0 + longhorn-manager: Node + name: nodes.longhorn.io +spec: + group: longhorn.io + names: + kind: Node + listKind: NodeList + plural: nodes + shortNames: + - lhn + singular: node + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: Ready + type: string + description: Indicate whether the node is ready + jsonPath: .status.conditions['Ready']['status'] + - name: AllowScheduling + type: boolean + description: Indicate whether the user disabled/enabled replica scheduling for the node + jsonPath: .spec.allowScheduling + - name: Schedulable + type: string + description: Indicate whether Longhorn can schedule replicas on the node + jsonPath: .status.conditions['Schedulable']['status'] + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: + app.kubernetes.io/name: longhorn + helm.sh/chart: longhorn-1.2.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: longhorn + app.kubernetes.io/version: v1.2.0 + longhorn-manager: InstanceManager + name: instancemanagers.longhorn.io +spec: + group: longhorn.io + names: + kind: InstanceManager + listKind: InstanceManagerList + plural: instancemanagers + shortNames: + - lhim + singular: instancemanager + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: State + type: string + description: The state of the instance manager + jsonPath: .status.currentState + - name: Type + type: string + description: The type of the instance manager (engine or replica) + jsonPath: .spec.type + - name: Node + type: string + description: The node that the instance manager is running on + jsonPath: .spec.nodeID + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: + app.kubernetes.io/name: longhorn + helm.sh/chart: longhorn-1.2.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: longhorn + app.kubernetes.io/version: v1.2.0 + longhorn-manager: ShareManager + name: sharemanagers.longhorn.io +spec: + group: longhorn.io + names: + kind: ShareManager + listKind: ShareManagerList + plural: sharemanagers + shortNames: + - lhsm + singular: sharemanager + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: State + type: string + description: The state of the share manager + jsonPath: .status.state + - name: Node + type: string + description: The node that the share manager is owned by + jsonPath: .status.ownerID + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: + app.kubernetes.io/name: longhorn + helm.sh/chart: longhorn-1.2.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: longhorn + app.kubernetes.io/version: v1.2.0 + longhorn-manager: BackingImage + name: backingimages.longhorn.io +spec: + group: longhorn.io + names: + kind: BackingImage + listKind: BackingImageList + plural: backingimages + shortNames: + - lhbi + singular: backingimage + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: Image + type: string + description: The backing image name + jsonPath: .spec.image + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: + app.kubernetes.io/name: longhorn + helm.sh/chart: longhorn-1.2.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: longhorn + app.kubernetes.io/version: v1.2.0 + longhorn-manager: BackingImageManager + name: backingimagemanagers.longhorn.io +spec: + group: longhorn.io + names: + kind: BackingImageManager + listKind: BackingImageManagerList + plural: backingimagemanagers + shortNames: + - lhbim + singular: backingimagemanager + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: State + type: string + description: The current state of the manager + jsonPath: .status.currentState + - name: Image + type: string + description: The image the manager pod will use + jsonPath: .spec.image + - name: Node + type: string + description: The node the manager is on + jsonPath: .spec.nodeID + - name: DiskUUID + type: string + description: The disk the manager is responsible for + jsonPath: .spec.diskUUID + - name: DiskPath + type: string + description: The disk path the manager is using + jsonPath: .spec.diskPath + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: + app.kubernetes.io/name: longhorn + helm.sh/chart: longhorn-1.2.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: longhorn + app.kubernetes.io/version: v1.2.0 + longhorn-manager: BackingImageDataSource + name: backingimagedatasources.longhorn.io +spec: + group: longhorn.io + names: + kind: BackingImageDataSource + listKind: BackingImageDataSourceList + plural: backingimagedatasources + shortNames: + - lhbids + singular: backingimagedatasource + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: State + type: string + description: The current state of the pod used to provisione the backing image file from source + jsonPath: .status.currentState + - name: SourceType + type: string + description: The data source type + jsonPath: .spec.sourceType + - name: Node + type: string + description: The node the backing image file will be prepared on + jsonPath: .spec.nodeID + - name: DiskUUID + type: string + description: The disk the backing image file will be prepared on + jsonPath: .spec.diskUUID + - name: Age + type: date + jsonPath: .metadata.creationTimestamp +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: + app.kubernetes.io/name: longhorn + helm.sh/chart: longhorn-1.2.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: longhorn + app.kubernetes.io/version: v1.2.0 + longhorn-manager: BackupTarget + name: backuptargets.longhorn.io +spec: + group: longhorn.io + names: + kind: BackupTarget + listKind: BackupTargetList + plural: backuptargets + shortNames: + - lhbt + singular: backuptarget + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: URL + type: string + description: The backup target URL + jsonPath: .spec.backupTargetURL + - name: Credential + type: string + description: The backup target credential secret + jsonPath: .spec.credentialSecret + - name: Interval + type: string + description: The backup target poll interval + jsonPath: .spec.pollInterval + - name: Available + type: boolean + description: Indicate whether the backup target is available or not + jsonPath: .status.available + - name: LastSyncedAt + type: string + description: The backup target last synced time + jsonPath: .status.lastSyncedAt +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: + app.kubernetes.io/name: longhorn + helm.sh/chart: longhorn-1.2.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: longhorn + app.kubernetes.io/version: v1.2.0 + longhorn-manager: BackupVolume + name: backupvolumes.longhorn.io +spec: + group: longhorn.io + names: + kind: BackupVolume + listKind: BackupVolumeList + plural: backupvolumes + shortNames: + - lhbv + singular: backupvolume + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: CreatedAt + type: string + description: The backup volume creation time + jsonPath: .status.createdAt + - name: LastBackupName + type: string + description: The backup volume last backup name + jsonPath: .status.lastBackupName + - name: LastBackupAt + type: string + description: The backup volume last backup time + jsonPath: .status.lastBackupAt + - name: LastSyncedAt + type: string + description: The backup volume last synced time + jsonPath: .status.lastSyncedAt +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: + app.kubernetes.io/name: longhorn + helm.sh/chart: longhorn-1.2.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: longhorn + app.kubernetes.io/version: v1.2.0 + longhorn-manager: Backup + name: backups.longhorn.io +spec: + group: longhorn.io + names: + kind: Backup + listKind: BackupList + plural: backups + shortNames: + - lhb + singular: backup + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: SnapshotName + type: string + description: The snapshot name + jsonPath: .status.snapshotName + - name: SnapshotSize + type: string + description: The snapshot size + jsonPath: .status.size + - name: SnapshotCreatedAt + type: string + description: The snapshot creation time + jsonPath: .status.snapshotCreatedAt + - name: State + type: string + description: The backup state + jsonPath: .status.state + - name: LastSyncedAt + type: string + description: The backup last synced time + jsonPath: .status.lastSyncedAt +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: + app.kubernetes.io/name: longhorn + helm.sh/chart: longhorn-1.2.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: longhorn + app.kubernetes.io/version: v1.2.0 + longhorn-manager: RecurringJob + name: recurringjobs.longhorn.io +spec: + group: longhorn.io + names: + kind: RecurringJob + listKind: RecurringJobList + plural: recurringjobs + shortNames: + - lhrj + singular: recurringjob + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + metadata: + type: object + properties: + name: + type: string + spec: + type: object + properties: + groups: + type: array + items: + type: string + task: + type: string + pattern: "^snapshot|backup$" + cron: + type: string + retain: + type: integer + concurrency: + type: integer + labels: + x-kubernetes-preserve-unknown-fields: true + status: + x-kubernetes-preserve-unknown-fields: true + subresources: + status: {} + additionalPrinterColumns: + - name: Groups + type: string + description: Sets groupings to the jobs. When set to "default" group will be added to the volume label when no other job label exist in volume. + jsonPath: .spec.groups + - name: Task + type: string + description: Should be one of "backup" or "snapshot". + jsonPath: .spec.task + - name: Cron + type: string + description: The cron expression represents recurring job scheduling. + jsonPath: .spec.cron + - name: Retain + type: integer + description: The number of snapshots/backups to keep for the volume. + jsonPath: .spec.retain + - name: Concurrency + type: integer + description: The concurrent job to run by each cron job. + jsonPath: .spec.concurrency + - name: Age + type: date + jsonPath: .metadata.creationTimestamp + - name: Labels + type: string + description: Specify the labels + jsonPath: .spec.labels \ No newline at end of file diff --git a/packages/longhorn-1.2/generated-changes/overlay/templates/userroles.yaml b/packages/longhorn-1.2/generated-changes/overlay/templates/userroles.yaml new file mode 100644 index 000000000..24bcfbe23 --- /dev/null +++ b/packages/longhorn-1.2/generated-changes/overlay/templates/userroles.yaml @@ -0,0 +1,47 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: "longhorn-admin" + labels: + rbac.authorization.k8s.io/aggregate-to-admin: "true" +rules: +- apiGroups: [ "longhorn.io" ] + resources: ["volumes", "volumes/status", "engines", "engines/status", "replicas", "replicas/status", "settings", + "engineimages", "engineimages/status", "nodes", "nodes/status", "instancemanagers", "instancemanagers/status", + "sharemanagers", "sharemanagers/status", "backingimages", "backingimages/status", + "backingimagemanagers", "backingimagemanagers/status", "backingimagedatasources", "backingimagedatasources/status", + "backuptargets", "backuptargets/status", "backupvolumes", "backupvolumes/status", "backups", "backups/status", + "recurringjobs", "recurringjobs/status"] + verbs: [ "*" ] +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: "longhorn-edit" + labels: + rbac.authorization.k8s.io/aggregate-to-edit: "true" +rules: +- apiGroups: [ "longhorn.io" ] + resources: ["volumes", "volumes/status", "engines", "engines/status", "replicas", "replicas/status", "settings", + "engineimages", "engineimages/status", "nodes", "nodes/status", "instancemanagers", "instancemanagers/status", + "sharemanagers", "sharemanagers/status", "backingimages", "backingimages/status", + "backingimagemanagers", "backingimagemanagers/status", "backingimagedatasources", "backingimagedatasources/status", + "backuptargets", "backuptargets/status", "backupvolumes", "backupvolumes/status", "backups", "backups/status", + "recurringjobs", "recurringjobs/status"] + verbs: [ "*" ] +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: "longhorn-view" + labels: + rbac.authorization.k8s.io/aggregate-to-view: "true" +rules: +- apiGroups: [ "longhorn.io" ] + resources: ["volumes", "volumes/status", "engines", "engines/status", "replicas", "replicas/status", "settings", + "engineimages", "engineimages/status", "nodes", "nodes/status", "instancemanagers", "instancemanagers/status", + "sharemanagers", "sharemanagers/status", "backingimages", "backingimages/status", + "backingimagemanagers", "backingimagemanagers/status", "backingimagedatasources", "backingimagedatasources/status", + "backuptargets", "backuptargets/status", "backupvolumes", "backupvolumes/status", "backups", "backups/status", + "recurringjobs", "recurringjobs/status"] + verbs: [ "get", "list", "watch" ] \ No newline at end of file diff --git a/packages/longhorn-1.2/generated-changes/patch/Chart.yaml.patch b/packages/longhorn-1.2/generated-changes/patch/Chart.yaml.patch new file mode 100644 index 000000000..2914654d4 --- /dev/null +++ b/packages/longhorn-1.2/generated-changes/patch/Chart.yaml.patch @@ -0,0 +1,17 @@ +--- charts-original/Chart.yaml ++++ charts/Chart.yaml +@@ -26,3 +26,14 @@ + - name: Longhorn maintainers + email: maintainers@longhorn.io + icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/longhorn/icon/color/longhorn-icon-color.png ++annotations: ++ catalog.cattle.io/certified: rancher ++ catalog.cattle.io/namespace: longhorn-system ++ catalog.cattle.io/release-name: longhorn ++ catalog.cattle.io/type: cluster-tool ++ catalog.cattle.io/ui-component: longhorn ++ catalog.cattle.io/provides-gvr: longhorn.io/v1beta1 ++ 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' diff --git a/packages/longhorn-1.2/generated-changes/patch/README.md.patch b/packages/longhorn-1.2/generated-changes/patch/README.md.patch new file mode 100644 index 000000000..b92a6e20c --- /dev/null +++ b/packages/longhorn-1.2/generated-changes/patch/README.md.patch @@ -0,0 +1,47 @@ +--- charts-original/README.md ++++ charts/README.md +@@ -22,41 +22,12 @@ + 3. Make sure `bash`, `curl`, `findmnt`, `grep`, `awk` and `blkid` has been installed in all nodes of the Kubernetes cluster. + 4. Make sure `open-iscsi` has been installed, and the `iscsid` daemon is running on all nodes of the Kubernetes cluster. For GKE, recommended Ubuntu as guest OS image since it contains `open-iscsi` already. + +-## Installation +-1. Add Longhorn chart repository. +-``` +-helm repo add longhorn https://charts.longhorn.io +-``` +- +-2. Update local Longhorn chart information from chart repository. +-``` +-helm repo update +-``` +- +-3. Install Longhorn chart. +-- With Helm 2, the following command will create the `longhorn-system` namespace and install the Longhorn chart together. +-``` +-helm install longhorn/longhorn --name longhorn --namespace longhorn-system +-``` +-- With Helm 3, the following commands will create the `longhorn-system` namespace first, then install the Longhorn chart. +- +-``` +-kubectl create namespace longhorn-system +-helm install longhorn longhorn/longhorn --namespace longhorn-system +-``` +- + ## Uninstallation + +-With Helm 2 to uninstall Longhorn. +-``` +-helm delete longhorn --purge +-``` ++To prevent damage to the Kubernetes cluster, we recommend deleting all Kubernetes workloads using Longhorn volumes (PersistentVolume, PersistentVolumeClaim, StorageClass, Deployment, StatefulSet, DaemonSet, etc). ++ ++From Rancher Cluster Explorer UI, navigate to Apps page, delete app `longhorn` then app `longhorn-crd` in Installed Apps tab. + +-With Helm 3 to uninstall Longhorn. +-``` +-helm uninstall longhorn -n longhorn-system +-kubectl delete namespace longhorn-system +-``` + + --- + Please see [link](https://github.com/longhorn/longhorn) for more information. 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..26cb8d78c --- /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: k8s.gcr.io/sig-storage/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: k8s.gcr.io/sig-storage/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: k8s.gcr.io/sig-storage/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: k8s.gcr.io/sig-storage/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: k8s.gcr.io/sig-storage/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..b68b19092 --- /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.0 + manager: +- repository: longhornio/longhorn-manager ++ repository: rancher/mirrored-longhornio-longhorn-manager + tag: v1.2.0 + ui: +- repository: longhornio/longhorn-ui ++ repository: rancher/mirrored-longhornio-longhorn-ui + tag: v1.2.0 + instanceManager: +- repository: longhornio/longhorn-instance-manager ++ repository: rancher/mirrored-longhornio-longhorn-instance-manager + tag: v1_20210731 + shareManager: +- repository: longhornio/longhorn-share-manager ++ repository: rancher/mirrored-longhornio-longhorn-share-manager + tag: v1_20210820 + backingImageManager: +- repository: longhornio/backing-image-manager ++ repository: rancher/mirrored-longhornio-backing-image-manager + tag: v2_20210820 + csi: + attacher: +- repository: k8s.gcr.io/sig-storage/csi-attacher ++ repository: rancher/mirrored-longhornio-csi-attacher + tag: v3.2.1 + provisioner: +- repository: k8s.gcr.io/sig-storage/csi-provisioner ++ repository: rancher/mirrored-longhornio-csi-provisioner + tag: v2.1.2 + nodeDriverRegistrar: +- repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar ++ repository: rancher/mirrored-longhornio-csi-node-driver-registrar + tag: v2.3.0 + resizer: +- repository: k8s.gcr.io/sig-storage/csi-resizer ++ repository: rancher/mirrored-longhornio-csi-resizer + tag: v1.2.0 + snapshotter: +- repository: k8s.gcr.io/sig-storage/csi-snapshotter ++ repository: rancher/mirrored-longhornio-csi-snapshotter + tag: v3.0.3 + pullPolicy: IfNotPresent + diff --git a/packages/longhorn-1.2/package.yaml b/packages/longhorn-1.2/package.yaml new file mode 100644 index 000000000..9138fd74a --- /dev/null +++ b/packages/longhorn-1.2/package.yaml @@ -0,0 +1,10 @@ +url: https://github.com/longhorn/charts.git +subdirectory: charts/longhorn +commit: 674a553a9363996e4150e487ad6cfb59479db3a1 +version: 100.1.0 +additionalCharts: +- workingDir: charts-crd + crdOptions: + templateDirectory: crd-template + crdDirectory: templates + addCRDValidationToMainChart: true diff --git a/packages/longhorn-1.2/templates/crd-template/Chart.yaml b/packages/longhorn-1.2/templates/crd-template/Chart.yaml new file mode 100644 index 000000000..757371b41 --- /dev/null +++ b/packages/longhorn-1.2/templates/crd-template/Chart.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +version: 1.2.0 +description: Installs the CRDs for longhorn. +name: longhorn-crd +type: application +annotations: + catalog.cattle.io/hidden: "true" + catalog.cattle.io/release-name: longhorn-crd + catalog.cattle.io/certified: rancher + catalog.cattle.io/namespace: longhorn-system diff --git a/packages/longhorn-1.2/templates/crd-template/README.md b/packages/longhorn-1.2/templates/crd-template/README.md new file mode 100644 index 000000000..d9f7f14b3 --- /dev/null +++ b/packages/longhorn-1.2/templates/crd-template/README.md @@ -0,0 +1,2 @@ +# longhorn-crd +A Rancher chart that installs the CRDs used by longhorn. diff --git a/packages/rancher-aks-operator-crd/package.yaml b/packages/rancher-aks-operator-crd/package.yaml index 5d7a1436e..754679220 100644 --- a/packages/rancher-aks-operator-crd/package.yaml +++ b/packages/rancher-aks-operator-crd/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/aks-operator/releases/download/v1.0.2-rc1/rancher-aks-operator-crd-1.0.2-rc1.tgz -version: 100.0.1 +url: https://github.com/rancher/aks-operator/releases/download/v1.0.1/rancher-aks-operator-crd-1.0.1.tgz +version: 100.0.0 diff --git a/packages/rancher-aks-operator/package.yaml b/packages/rancher-aks-operator/package.yaml index c1585fca1..b8b03e344 100644 --- a/packages/rancher-aks-operator/package.yaml +++ b/packages/rancher-aks-operator/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/aks-operator/releases/download/v1.0.2-rc1/rancher-aks-operator-1.0.2-rc1.tgz -version: 100.0.1 +url: https://github.com/rancher/aks-operator/releases/download/v1.0.1/rancher-aks-operator-1.0.1.tgz +version: 100.0.0 diff --git a/packages/rancher-backup-crd/package.yaml b/packages/rancher-backup-crd/package.yaml index 4fb0f0e6f..83e611097 100644 --- a/packages/rancher-backup-crd/package.yaml +++ b/packages/rancher-backup-crd/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/backup-restore-operator/releases/download/v2.0.0/rancher-backup-crd-2.0.0.tgz +url: https://github.com/rancher/backup-restore-operator/releases/download/v2.0.0-rc11/rancher-backup-crd-2.0.0-rc11.tgz version: 2.0.0 diff --git a/packages/rancher-backup/package.yaml b/packages/rancher-backup/package.yaml index bfafc6488..70a6df814 100644 --- a/packages/rancher-backup/package.yaml +++ b/packages/rancher-backup/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/backup-restore-operator/releases/download/v2.0.0/rancher-backup-2.0.0.tgz +url: https://github.com/rancher/backup-restore-operator/releases/download/v2.0.0-rc11/rancher-backup-2.0.0-rc11.tgz version: 2.0.0 diff --git a/packages/rancher-cis-benchmark/charts/Chart.yaml b/packages/rancher-cis-benchmark/charts/Chart.yaml index 1c1cd49c3..1f39422b7 100644 --- a/packages/rancher-cis-benchmark/charts/Chart.yaml +++ b/packages/rancher-cis-benchmark/charts/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: v1.0.6 +appVersion: v1.0.5 description: The cis-operator enables running CIS benchmark security scans on a kubernetes cluster name: rancher-cis-benchmark version: 1.0.6 @@ -16,4 +16,3 @@ annotations: catalog.cattle.io/display-name: "CIS Benchmark" catalog.cattle.io/os: linux catalog.cattle.io/auto-install: rancher-cis-benchmark-crd=match - catalog.cattle.io/rancher-version: ">= 2.6.0" diff --git a/packages/rancher-cis-benchmark/charts/values.yaml b/packages/rancher-cis-benchmark/charts/values.yaml index 8c3fc3e16..280baa7b0 100644 --- a/packages/rancher-cis-benchmark/charts/values.yaml +++ b/packages/rancher-cis-benchmark/charts/values.yaml @@ -5,13 +5,13 @@ image: cisoperator: repository: rancher/cis-operator - tag: v1.0.6-rc1 + tag: v1.0.5-rc2 securityScan: repository: rancher/security-scan - tag: v0.2.4-rc1 + tag: v0.2.3 sonobuoy: repository: rancher/mirrored-sonobuoy-sonobuoy - tag: v0.53.2 + tag: v0.16.3 resources: {} # We usually recommend not to specify default resources and to leave this as a conscious diff --git a/packages/rancher-cis-benchmark/package.yaml b/packages/rancher-cis-benchmark/package.yaml index 6fd046315..27c074821 100644 --- a/packages/rancher-cis-benchmark/package.yaml +++ b/packages/rancher-cis-benchmark/package.yaml @@ -1,5 +1,5 @@ url: local -version: 2.0.1 +version: 2.0.0 additionalCharts: - workingDir: charts-crd crdOptions: diff --git a/packages/rancher-external-ip-webhook/package.yaml b/packages/rancher-external-ip-webhook/package.yaml index 049d16906..c09a072f6 100644 --- a/packages/rancher-external-ip-webhook/package.yaml +++ b/packages/rancher-external-ip-webhook/package.yaml @@ -1,2 +1,2 @@ url: https://github.com/rancher/externalip-webhook/releases/download/v1.0.0/rancher-externalip-webhook-1.0.0.tgz -version: 100.0.0 +version: 1.0.0 diff --git a/packages/rancher-gatekeeper/generated-changes/patch/Chart.yaml.patch b/packages/rancher-gatekeeper/generated-changes/patch/Chart.yaml.patch index 490894b83..a687f6d1c 100644 --- a/packages/rancher-gatekeeper/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-gatekeeper/generated-changes/patch/Chart.yaml.patch @@ -2,20 +2,18 @@ +++ charts/Chart.yaml @@ -1,10 +1,22 @@ apiVersion: v2 - appVersion: v3.6.0 + appVersion: v3.5.1 -description: A Helm chart for Gatekeeper +description: Modifies Open Policy Agent's upstream gatekeeper chart that provides policy-based control for cloud native environments home: https://github.com/open-policy-agent/gatekeeper keywords: --- open policy agent + - open policy agent -name: gatekeeper -+ - open policy agent -+ - security ++- security +name: rancher-gatekeeper sources: --- https://github.com/open-policy-agent/gatekeeper.git -+ - https://github.com/open-policy-agent/gatekeeper.git - version: 3.6.0 + - https://github.com/open-policy-agent/gatekeeper.git + version: 3.5.1 +icon: https://charts.rancher.io/assets/logos/gatekeeper.svg +annotations: + catalog.cattle.io/certified: rancher diff --git a/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-audit-deployment.yaml.patch b/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-audit-deployment.yaml.patch index 6e833d2ad..8df99ab2a 100644 --- a/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-audit-deployment.yaml.patch +++ b/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-audit-deployment.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/templates/gatekeeper-audit-deployment.yaml +++ charts/templates/gatekeeper-audit-deployment.yaml -@@ -65,7 +65,7 @@ +@@ -63,7 +63,7 @@ valueFrom: fieldRef: fieldPath: metadata.name diff --git a/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-controller-manager-deployment.yaml.patch b/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-controller-manager-deployment.yaml.patch index bc9ad5195..f885fca90 100644 --- a/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-controller-manager-deployment.yaml.patch +++ b/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-controller-manager-deployment.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/templates/gatekeeper-controller-manager-deployment.yaml +++ charts/templates/gatekeeper-controller-manager-deployment.yaml -@@ -71,7 +71,7 @@ +@@ -65,7 +65,7 @@ valueFrom: fieldRef: fieldPath: metadata.name diff --git a/packages/rancher-gatekeeper/generated-changes/patch/templates/upgrade-crds-hook.yaml.patch b/packages/rancher-gatekeeper/generated-changes/patch/templates/upgrade-crds-hook.yaml.patch deleted file mode 100644 index 031645501..000000000 --- a/packages/rancher-gatekeeper/generated-changes/patch/templates/upgrade-crds-hook.yaml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- charts-original/templates/upgrade-crds-hook.yaml -+++ charts/templates/upgrade-crds-hook.yaml -@@ -72,7 +72,7 @@ - restartPolicy: Never - containers: - - name: crds-upgrade -- image: '{{ .Values.image.crdRepository }}:{{ .Values.image.release }}' -+ image: '{{ template "system_default_registry" . }}{{ .Values.image.crdRepository }}:{{ .Values.image.tag }}' - imagePullPolicy: '{{ .Values.image.pullPolicy }}' - args: - - apply diff --git a/packages/rancher-gatekeeper/generated-changes/patch/values.yaml.patch b/packages/rancher-gatekeeper/generated-changes/patch/values.yaml.patch index 5f151b41c..b1a501fce 100644 --- a/packages/rancher-gatekeeper/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-gatekeeper/generated-changes/patch/values.yaml.patch @@ -7,7 +7,7 @@ auditMatchKindOnly: false constraintViolationsLimit: 20 auditFromCache: false -@@ -19,14 +19,14 @@ +@@ -16,13 +16,13 @@ labelNamespace: enabled: true image: @@ -19,15 +19,13 @@ pullSecrets: [] image: - repository: openpolicyagent/gatekeeper -- crdRepository: openpolicyagent/gatekeeper-crds -- release: v3.6.0 +- release: v3.5.1 + repository: rancher/mirrored-openpolicyagent-gatekeeper -+ crdRepository: rancher/mirrored-openpolicyagent-gatekeeper-crds -+ tag: v3.6.0 ++ tag: v3.5.1 pullPolicy: IfNotPresent pullSecrets: [] podAnnotations: -@@ -80,5 +80,11 @@ +@@ -70,5 +70,11 @@ pdb: controllerManager: minAvailable: 1 diff --git a/packages/rancher-gatekeeper/package.yaml b/packages/rancher-gatekeeper/package.yaml index 17c0c3534..0aa23231c 100644 --- a/packages/rancher-gatekeeper/package.yaml +++ b/packages/rancher-gatekeeper/package.yaml @@ -1,5 +1,5 @@ -url: https://open-policy-agent.github.io/gatekeeper/charts/gatekeeper-3.6.0.tgz -version: 100.0.1 +url: https://open-policy-agent.github.io/gatekeeper/charts/gatekeeper-3.5.1.tgz +version: 100.0.0 additionalCharts: - workingDir: charts-crd crdOptions: diff --git a/packages/rancher-gatekeeper/templates/crd-template/Chart.yaml b/packages/rancher-gatekeeper/templates/crd-template/Chart.yaml index f7ec02fa3..2d33b09bb 100644 --- a/packages/rancher-gatekeeper/templates/crd-template/Chart.yaml +++ b/packages/rancher-gatekeeper/templates/crd-template/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -version: 3.6.0 +version: 3.5.1 description: Installs the CRDs for rancher-gatekeeper. name: rancher-gatekeeper-crd type: application diff --git a/packages/rancher-vsphere-cpi/charts/questions.yaml b/packages/rancher-vsphere-cpi/charts/questions.yaml index 99ff81f35..dbef2a71d 100644 --- a/packages/rancher-vsphere-cpi/charts/questions.yaml +++ b/packages/rancher-vsphere-cpi/charts/questions.yaml @@ -1,4 +1,15 @@ questions: + - variable: clusterType + label: Cluster Type + description: Select the type of the cluster where vSphere CPI will be deployed + type: enum + default: "rke" + options: + - "rke" + - "rke2" + - "other" + group: Configuration + - variable: vCenter.host label: vCenter Host description: IP address or FQDN of the vCenter diff --git a/packages/rancher-vsphere-cpi/charts/templates/vsphere-cpi-ds.yaml b/packages/rancher-vsphere-cpi/charts/templates/vsphere-cpi-ds.yaml index 82d46e3bb..2e4ee8e41 100644 --- a/packages/rancher-vsphere-cpi/charts/templates/vsphere-cpi-ds.yaml +++ b/packages/rancher-vsphere-cpi/charts/templates/vsphere-cpi-ds.yaml @@ -26,23 +26,12 @@ spec: {{- with .Values.cloudControllerManager.nodeSelector }} {{- toYaml . | nindent 8 }} {{- end }} - {{- else }} - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - # RKE node selector label - - key: node-role.kubernetes.io/controlplane - operator: In - values: - - "true" - - matchExpressions: - # RKE2 node selector label - - key: node-role.kubernetes.io/control-plane - operator: In - values: - - "true" + {{- else if eq .Values.clusterType "rke" }} + nodeSelector: + node-role.kubernetes.io/controlplane: "true" + {{- else if eq .Values.clusterType "rke2" }} + nodeSelector: + node-role.kubernetes.io/control-plane: "true" {{- end }} securityContext: runAsUser: 1001 diff --git a/packages/rancher-vsphere-cpi/charts/values.yaml b/packages/rancher-vsphere-cpi/charts/values.yaml index 41e01f888..708112e82 100644 --- a/packages/rancher-vsphere-cpi/charts/values.yaml +++ b/packages/rancher-vsphere-cpi/charts/values.yaml @@ -17,6 +17,9 @@ cloudControllerManager: rbac: enabled: true +# Set to "rke" or "rke2" to apply the node selector label appropriate for the cluster +clusterType: "rke" + global: cattle: systemDefaultRegistry: "" diff --git a/packages/rancher-vsphere-csi/charts/templates/vsphere-csi-controller-deployment.yaml b/packages/rancher-vsphere-csi/charts/templates/vsphere-csi-controller-deployment.yaml index 7cc78cd8a..1e001c4b6 100644 --- a/packages/rancher-vsphere-csi/charts/templates/vsphere-csi-controller-deployment.yaml +++ b/packages/rancher-vsphere-csi/charts/templates/vsphere-csi-controller-deployment.yaml @@ -15,30 +15,15 @@ spec: app: vsphere-csi-controller role: vsphere-csi spec: - {{- if .Values.csiController.nodeSelector }} + serviceAccountName: vsphere-csi-controller nodeSelector: + {{- if .Values.csiController.nodeSelector }} {{- with .Values.csiController.nodeSelector }} {{- toYaml . | nindent 8 }} {{- end }} {{- else }} - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - # RKE node selector label - - key: node-role.kubernetes.io/controlplane - operator: In - values: - - "true" - - matchExpressions: - # RKE2 node selector label - - key: node-role.kubernetes.io/control-plane - operator: In - values: - - "true" + node-role.kubernetes.io/controlplane: "true" {{- end }} - serviceAccountName: vsphere-csi-controller tolerations: # Rancher specific change: These tolerations are intentionally different from upstream to avoid lessening the scope to only NoSchedule with a specific key # - key: node-role.kubernetes.io/master diff --git a/packages/rancher-webhook/package.yaml b/packages/rancher-webhook/package.yaml index f480884b3..71aad7def 100644 --- a/packages/rancher-webhook/package.yaml +++ b/packages/rancher-webhook/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/webhook/releases/download/v0.2.1-rc2/rancher-webhook-0.2.1-rc2.tgz -version: 1.0.1 +url: https://github.com/rancher/webhook/releases/download/v0.2.0-beta07/rancher-webhook-0.2.0-beta07.tgz +version: 1.0.0