diff --git a/packages/longhorn-1.2/generated-changes/exclude/templates/crds.yaml b/packages/longhorn-1.2/generated-changes/exclude/templates/crds.yaml deleted file mode 100644 index 4086ef811..000000000 --- a/packages/longhorn-1.2/generated-changes/exclude/templates/crds.yaml +++ /dev/null @@ -1,758 +0,0 @@ -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 deleted file mode 100644 index 427a39723..000000000 --- a/packages/longhorn-1.2/generated-changes/overlay/crds/crds.yaml +++ /dev/null @@ -1,832 +0,0 @@ -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 deleted file mode 100644 index 24bcfbe23..000000000 --- a/packages/longhorn-1.2/generated-changes/overlay/templates/userroles.yaml +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index 2914654d4..000000000 --- a/packages/longhorn-1.2/generated-changes/patch/Chart.yaml.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 deleted file mode 100644 index b92a6e20c..000000000 --- a/packages/longhorn-1.2/generated-changes/patch/README.md.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- 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 deleted file mode 100644 index 26cb8d78c..000000000 --- a/packages/longhorn-1.2/generated-changes/patch/questions.yml.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- 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 deleted file mode 100644 index b68b19092..000000000 --- a/packages/longhorn-1.2/generated-changes/patch/values.yaml.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- 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 deleted file mode 100644 index 9138fd74a..000000000 --- a/packages/longhorn-1.2/package.yaml +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index 757371b41..000000000 --- a/packages/longhorn-1.2/templates/crd-template/Chart.yaml +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index d9f7f14b3..000000000 --- a/packages/longhorn-1.2/templates/crd-template/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# longhorn-crd -A Rancher chart that installs the CRDs used by longhorn. diff --git a/packages/longhorn-1.1/generated-changes/exclude/templates/crds.yaml b/packages/longhorn/generated-changes/exclude/templates/crds.yaml similarity index 100% rename from packages/longhorn-1.1/generated-changes/exclude/templates/crds.yaml rename to packages/longhorn/generated-changes/exclude/templates/crds.yaml diff --git a/packages/longhorn-1.1/generated-changes/overlay/crds/crds.yaml b/packages/longhorn/generated-changes/overlay/crds/crds.yaml similarity index 100% rename from packages/longhorn-1.1/generated-changes/overlay/crds/crds.yaml rename to packages/longhorn/generated-changes/overlay/crds/crds.yaml diff --git a/packages/longhorn-1.1/generated-changes/overlay/templates/userroles.yaml b/packages/longhorn/generated-changes/overlay/templates/userroles.yaml similarity index 100% rename from packages/longhorn-1.1/generated-changes/overlay/templates/userroles.yaml rename to packages/longhorn/generated-changes/overlay/templates/userroles.yaml diff --git a/packages/longhorn-1.1/generated-changes/patch/Chart.yaml.patch b/packages/longhorn/generated-changes/patch/Chart.yaml.patch similarity index 90% rename from packages/longhorn-1.1/generated-changes/patch/Chart.yaml.patch rename to packages/longhorn/generated-changes/patch/Chart.yaml.patch index c6ced8d9f..e2a0874c8 100644 --- a/packages/longhorn-1.1/generated-changes/patch/Chart.yaml.patch +++ b/packages/longhorn/generated-changes/patch/Chart.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/Chart.yaml +++ charts/Chart.yaml -@@ -27,3 +27,14 @@ +@@ -27,3 +27,13 @@ - 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,3 @@ + 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.1/generated-changes/patch/README.md.patch b/packages/longhorn/generated-changes/patch/README.md.patch similarity index 100% rename from packages/longhorn-1.1/generated-changes/patch/README.md.patch rename to packages/longhorn/generated-changes/patch/README.md.patch diff --git a/packages/longhorn-1.1/generated-changes/patch/questions.yml.patch b/packages/longhorn/generated-changes/patch/questions.yml.patch similarity index 100% rename from packages/longhorn-1.1/generated-changes/patch/questions.yml.patch rename to packages/longhorn/generated-changes/patch/questions.yml.patch diff --git a/packages/longhorn-1.1/generated-changes/patch/values.yaml.patch b/packages/longhorn/generated-changes/patch/values.yaml.patch similarity index 100% rename from packages/longhorn-1.1/generated-changes/patch/values.yaml.patch rename to packages/longhorn/generated-changes/patch/values.yaml.patch diff --git a/packages/longhorn-1.1/package.yaml b/packages/longhorn/package.yaml similarity index 100% rename from packages/longhorn-1.1/package.yaml rename to packages/longhorn/package.yaml diff --git a/packages/longhorn-1.1/templates/crd-template/Chart.yaml b/packages/longhorn/templates/crd-template/Chart.yaml similarity index 100% rename from packages/longhorn-1.1/templates/crd-template/Chart.yaml rename to packages/longhorn/templates/crd-template/Chart.yaml diff --git a/packages/longhorn-1.1/templates/crd-template/README.md b/packages/longhorn/templates/crd-template/README.md similarity index 100% rename from packages/longhorn-1.1/templates/crd-template/README.md rename to packages/longhorn/templates/crd-template/README.md diff --git a/packages/rancher-cis-benchmark/charts/values.yaml b/packages/rancher-cis-benchmark/charts/values.yaml index 6226f094f..8c3fc3e16 100644 --- a/packages/rancher-cis-benchmark/charts/values.yaml +++ b/packages/rancher-cis-benchmark/charts/values.yaml @@ -8,7 +8,7 @@ image: tag: v1.0.6-rc1 securityScan: repository: rancher/security-scan - tag: v0.2.4-rc2 + tag: v0.2.4-rc1 sonobuoy: repository: rancher/mirrored-sonobuoy-sonobuoy tag: v0.53.2 diff --git a/packages/rancher-istio/charts/Chart.yaml b/packages/rancher-istio/charts/Chart.yaml index 82a387e1b..815797216 100644 --- a/packages/rancher-istio/charts/Chart.yaml +++ b/packages/rancher-istio/charts/Chart.yaml @@ -19,3 +19,4 @@ annotations: catalog.cattle.io/os: linux catalog.cattle.io/requests-cpu: "710m" catalog.cattle.io/requests-memory: "2314Mi" + catalog.cattle.io/rancher-version: ">= 2.6.0-0" diff --git a/packages/rancher-istio/charts/templates/istio-install-job.yaml b/packages/rancher-istio/charts/templates/istio-install-job.yaml index 9a13f5698..aee664c6a 100644 --- a/packages/rancher-istio/charts/templates/istio-install-job.yaml +++ b/packages/rancher-istio/charts/templates/istio-install-job.yaml @@ -11,6 +11,12 @@ spec: backoffLimit: 1 template: spec: + {{- if .Values.installer.releaseMirror.enabled }} + hostAliases: + - ip: "127.0.0.1" + hostnames: + - "github.com" + {{- end }} containers: - name: istioctl-installer image: {{ template "system_default_registry" . }}{{ .Values.installer.repository }}:{{ .Values.installer.tag }} @@ -21,6 +27,8 @@ spec: value: {{ template "istio.namespace" . }} - name: FORCE_INSTALL value: {{ .Values.forceInstall | default "false" | quote }} + - name: RELEASE_MIRROR_ENABLED + value: {{ .Values.installer.releaseMirror.enabled | quote }} command: ["/bin/sh","-c"] args: ["/usr/local/app/scripts/run.sh"] volumeMounts: @@ -42,9 +50,7 @@ spec: name: istio-installer-overlay {{- end }} serviceAccountName: istio-installer - {{- if .Values.global.rbac.pspEnabled }} securityContext: runAsUser: 101 runAsGroup: 101 - {{- end }} restartPolicy: Never diff --git a/packages/rancher-istio/charts/values.yaml b/packages/rancher-istio/charts/values.yaml index 0db701795..df28d6250 100644 --- a/packages/rancher-istio/charts/values.yaml +++ b/packages/rancher-istio/charts/values.yaml @@ -5,7 +5,12 @@ forceInstall: false installer: repository: rancher/istio-installer - tag: 1.10.4-rancher1 + tag: 1.10.4-rancher2 + ##releaseMirror are configurations for istio upgrades. + ##Setting releaseMirror.enabled: true will cause istio to use bundled in images from rancher/istio-installer to perfom an upgrade - this is ideal + ##for airgap setups. Setting releaseMirror.enabled to false means istio will call externally to github to fetch the required assets. + releaseMirror: + enabled: false ##Native support for dns added in 1.8 dns: @@ -56,7 +61,7 @@ global: defaultPodDisruptionBudget: enabled: true rbac: - pspEnabled: false + pspEnabled: true # Kiali subchart from rancher-kiali-server kiali: 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 da017cbbc..7cc78cd8a 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 @@ -39,17 +39,25 @@ spec: - "true" {{- end }} serviceAccountName: vsphere-csi-controller - {{- if .Values.csiController.tolerations }} tolerations: - {{- with .Values.csiController.tolerations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- else }} - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists + # 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 + # operator: Exists + # effect: NoSchedule + - operator: "Exists" effect: NoSchedule - {{- end }} + - operator: "Exists" + effect: NoExecute + # uncomment below toleration if you need an aggressive pod eviction in case when + # node becomes not-ready or unreachable. Default is 300 seconds if not specified. + #- key: node.kubernetes.io/not-ready + # operator: Exists + # effect: NoExecute + # tolerationSeconds: 30 + #- key: node.kubernetes.io/unreachable + # operator: Exists + # effect: NoExecute + # tolerationSeconds: 30 dnsPolicy: "Default" containers: - name: csi-attacher diff --git a/packages/rancher-vsphere-csi/charts/values.yaml b/packages/rancher-vsphere-csi/charts/values.yaml index a1c865b0c..77947dfa9 100644 --- a/packages/rancher-vsphere-csi/charts/values.yaml +++ b/packages/rancher-vsphere-csi/charts/values.yaml @@ -42,17 +42,6 @@ csiController: repository: rancher/mirrored-k8scsi-csi-provisioner tag: v2.1.0 nodeSelector: {} - # Uncomment below toleration if you need an aggressive pod eviction in case when - # node becomes not-ready or unreachable. Default is 300 seconds if not specified. - # tolerations: - # - key: node.kubernetes.io/not-ready - # operator: Exists - # effect: NoExecute - # tolerationSeconds: 30 - # - key: node.kubernetes.io/unreachable - # operator: Exists - # effect: NoExecute - # tolerationSeconds: 30 # Internal features csiMigration: diff --git a/packages/rancher-vsphere-csi/package.yaml b/packages/rancher-vsphere-csi/package.yaml index 98913ea9a..3b5eacdf6 100644 --- a/packages/rancher-vsphere-csi/package.yaml +++ b/packages/rancher-vsphere-csi/package.yaml @@ -1,2 +1,2 @@ url: local -version: 100.0.1 +version: 100.0.0