From 9b4976450f5ff76fbf0f1f579e642cc3fc037618 Mon Sep 17 00:00:00 2001 From: Erki Aas Date: Sun, 7 Jul 2024 14:00:27 +0300 Subject: [PATCH] Upgrade longhorn to 1.5.5 --- longhorn-system/application.yml | 173 ++++++++++++++++++++------------ longhorn-system/changes.diff | 1 + 2 files changed, 109 insertions(+), 65 deletions(-) diff --git a/longhorn-system/application.yml b/longhorn-system/application.yml index acf0200..c4dacb1 100644 --- a/longhorn-system/application.yml +++ b/longhorn-system/application.yml @@ -14,7 +14,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 --- # Source: longhorn/templates/serviceaccount.yaml apiVersion: v1 @@ -25,7 +25,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 --- # Source: longhorn/templates/default-setting.yaml apiVersion: v1 @@ -36,7 +36,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 data: default-setting.yaml: |- --- @@ -49,7 +49,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 data: storageclass.yaml: | kind: StorageClass @@ -68,6 +68,7 @@ data: fromBackup: "" fsType: "xfs" dataLocality: "best-effort" + unmapMarkSnapChainRemoved: "ignored" --- # Source: longhorn/templates/crds.yaml apiVersion: apiextensions.k8s.io/v1 @@ -79,7 +80,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: backingimagedatasources.longhorn.io spec: @@ -250,7 +251,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: backingimagemanagers.longhorn.io spec: @@ -392,6 +393,9 @@ spec: type: string uuid: type: string + virtualSize: + format: int64 + type: integer type: object nullable: true type: object @@ -426,7 +430,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: backingimages.longhorn.io spec: @@ -495,6 +499,10 @@ spec: jsonPath: .status.size name: Size type: string + - description: The virtual size of the image (may be larger than file size) + jsonPath: .status.virtualSize + name: VirtualSize + type: string - jsonPath: .metadata.creationTimestamp name: Age type: date @@ -562,6 +570,10 @@ spec: type: integer uuid: type: string + virtualSize: + description: Virtual size of image, which may be larger than physical size. Will be zero until known (e.g. while a backing image is uploading) + format: int64 + type: integer type: object type: object served: true @@ -585,7 +597,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: backups.longhorn.io spec: @@ -781,7 +793,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: backuptargets.longhorn.io spec: @@ -964,7 +976,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: backupvolumes.longhorn.io spec: @@ -1131,7 +1143,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: engineimages.longhorn.io spec: @@ -1319,11 +1331,10 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.7.0 - creationTimestamp: null labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: engines.longhorn.io spec: @@ -1335,6 +1346,7 @@ spec: shortNames: - lhe singular: engine + preserveUnknownFields: false scope: Namespaced versions: - additionalPrinterColumns: @@ -1595,6 +1607,11 @@ spec: type: string nullable: true type: object + replicaTransitionTimeMap: + additionalProperties: + type: string + description: ReplicaTransitionTimeMap records the time a replica in ReplicaModeMap transitions from one mode to another (or from not being in the ReplicaModeMap to being in it). This information is sometimes required by other controllers (e.g. the volume controller uses it to determine the correct value for replica.Spec.lastHealthyAt). + type: object restoreStatus: additionalProperties: properties: @@ -1674,11 +1691,10 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.7.0 - creationTimestamp: null labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: instancemanagers.longhorn.io spec: @@ -1690,6 +1706,7 @@ spec: shortNames: - lhim singular: instancemanager + preserveUnknownFields: false scope: Namespaced versions: - additionalPrinterColumns: @@ -1798,6 +1815,11 @@ spec: type: object status: properties: + conditions: + additionalProperties: + type: boolean + nullable: true + type: object endpoint: type: string errorMsg: @@ -1833,6 +1855,11 @@ spec: type: object status: properties: + conditions: + additionalProperties: + type: boolean + nullable: true + type: object endpoint: type: string errorMsg: @@ -1868,6 +1895,11 @@ spec: type: object status: properties: + conditions: + additionalProperties: + type: boolean + nullable: true + type: object endpoint: type: string errorMsg: @@ -1919,7 +1951,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: nodes.longhorn.io spec: @@ -2055,6 +2087,8 @@ spec: status: description: NodeStatus defines the observed state of the Longhorn node properties: + autoEvicting: + type: boolean conditions: items: properties: @@ -2110,6 +2144,8 @@ spec: type: string diskUUID: type: string + filesystemType: + type: string scheduledReplica: additionalProperties: format: int64 @@ -2163,7 +2199,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: orphans.longhorn.io spec: @@ -2430,11 +2466,10 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.7.0 - creationTimestamp: null labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: replicas.longhorn.io spec: @@ -2446,6 +2481,7 @@ spec: shortNames: - lhr singular: replica + preserveUnknownFields: false scope: Namespaced versions: - additionalPrinterColumns: @@ -2555,11 +2591,21 @@ spec: type: string engineName: type: string + evictionRequested: + type: boolean failedAt: + description: FailedAt is set when a running replica fails or when a running engine is unable to use a replica for any reason. FailedAt indicates the time the failure occurred. When FailedAt is set, a replica is likely to have useful (though possibly stale) data. A replica with FailedAt set must be rebuilt from a non-failed replica (or it can be used in a salvage if all replicas are failed). FailedAt is cleared before a rebuild or salvage. FailedAt may be later than the corresponding entry in an engine's replicaTransitionTimeMap because it is set when the volume controller acknowledges the change. type: string hardNodeAffinity: type: string healthyAt: + description: HealthyAt is set the first time a replica becomes read/write in an engine after creation or rebuild. HealthyAt indicates the time the last successful rebuild occurred. When HealthyAt is set, a replica is likely to have useful (though possibly stale) data. HealthyAt is cleared before a rebuild. HealthyAt may be later than the corresponding entry in an engine's replicaTransitionTimeMap because it is set when the volume controller acknowledges the change. + type: string + lastFailedAt: + description: LastFailedAt is always set at the same time as FailedAt. Unlike FailedAt, LastFailedAt is never cleared. LastFailedAt is not a reliable indicator of the state of a replica's data. For example, a replica with LastFailedAt may already be healthy and in use again. However, because it is never cleared, it can be compared to LastHealthyAt to help prevent dangerous replica deletion in some corner cases. LastFailedAt may be later than the corresponding entry in an engine's replicaTransitionTimeMap because it is set when the volume controller acknowledges the change. + type: string + lastHealthyAt: + description: LastHealthyAt is set every time a replica becomes read/write in an engine. Unlike HealthyAt, LastHealthyAt is never cleared. LastHealthyAt is not a reliable indicator of the state of a replica's data. For example, a replica with LastHealthyAt set may be in the middle of a rebuild. However, because it is never cleared, it can be compared to LastFailedAt to help prevent dangerous replica deletion in some corner cases. LastHealthyAt may be later than the corresponding entry in an engine's replicaTransitionTimeMap because it is set when the volume controller acknowledges the change. type: string logRequested: type: boolean @@ -2611,6 +2657,7 @@ spec: currentState: type: string evictionRequested: + description: 'Deprecated: Replaced by field `spec.evictionRequested`.' type: boolean instanceManagerName: type: string @@ -2647,11 +2694,10 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.7.0 - creationTimestamp: null labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: settings.longhorn.io spec: @@ -2663,6 +2709,7 @@ spec: shortNames: - lhs singular: setting + preserveUnknownFields: false scope: Namespaced versions: - additionalPrinterColumns: @@ -2742,7 +2789,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: sharemanagers.longhorn.io spec: @@ -2857,7 +2904,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: snapshots.longhorn.io spec: @@ -2984,7 +3031,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: supportbundles.longhorn.io spec: @@ -3110,7 +3157,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: systembackups.longhorn.io spec: @@ -3238,7 +3285,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: systemrestores.longhorn.io spec: @@ -3340,7 +3387,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: volumes.longhorn.io spec: @@ -3702,7 +3749,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 longhorn-manager: "" name: volumeattachments.longhorn.io spec: @@ -3831,7 +3878,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 rules: - apiGroups: - apiextensions.k8s.io @@ -3897,7 +3944,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -3915,7 +3962,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -3932,13 +3979,12 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 app: longhorn-manager name: longhorn-backend namespace: longhorn-system spec: type: ClusterIP - sessionAffinity: ClientIP selector: app: longhorn-manager ports: @@ -3953,7 +3999,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 app: longhorn-ui name: longhorn-frontend namespace: longhorn-system @@ -3974,13 +4020,12 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 app: longhorn-conversion-webhook name: longhorn-conversion-webhook namespace: longhorn-system spec: type: ClusterIP - sessionAffinity: ClientIP selector: app: longhorn-manager ports: @@ -3995,13 +4040,12 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 app: longhorn-admission-webhook name: longhorn-admission-webhook namespace: longhorn-system spec: type: ClusterIP - sessionAffinity: ClientIP selector: app: longhorn-manager ports: @@ -4016,13 +4060,12 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 app: longhorn-recovery-backend name: longhorn-recovery-backend namespace: longhorn-system spec: type: ClusterIP - sessionAffinity: ClientIP selector: app: longhorn-manager ports: @@ -4037,7 +4080,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 name: longhorn-engine-manager namespace: longhorn-system spec: @@ -4053,7 +4096,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 name: longhorn-replica-manager namespace: longhorn-system spec: @@ -4069,7 +4112,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 app: longhorn-manager name: longhorn-manager namespace: longhorn-system @@ -4082,7 +4125,7 @@ spec: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 app: longhorn-manager spec: tolerations: @@ -4096,7 +4139,7 @@ spec: effect: NoSchedule containers: - name: longhorn-manager - image: longhornio/longhorn-manager:v1.5.1 + image: longhornio/longhorn-manager:v1.5.5 imagePullPolicy: IfNotPresent securityContext: privileged: true @@ -4105,17 +4148,17 @@ spec: - -d - daemon - --engine-image - - "longhornio/longhorn-engine:v1.5.1" + - "longhornio/longhorn-engine:v1.5.5" - --instance-manager-image - - "longhornio/longhorn-instance-manager:v1.5.1" + - "longhornio/longhorn-instance-manager:v1.5.5" - --share-manager-image - - "longhornio/longhorn-share-manager:v1.5.1" + - "longhornio/longhorn-share-manager:v1.5.5" - --backing-image-manager-image - - "longhornio/backing-image-manager:v1.5.1" + - "longhornio/backing-image-manager:v1.5.5" - --support-bundle-manager-image - - "longhornio/support-bundle-kit:v0.0.25" + - "longhornio/support-bundle-kit:v0.0.37" - --manager-image - - "longhornio/longhorn-manager:v1.5.1" + - "longhornio/longhorn-manager:v1.5.5" - --service-account - longhorn-service-account ports: @@ -4183,7 +4226,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 spec: replicas: 1 selector: @@ -4194,7 +4237,7 @@ spec: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 app: longhorn-driver-deployer spec: tolerations: @@ -4208,18 +4251,18 @@ spec: effect: NoSchedule initContainers: - name: wait-longhorn-manager - image: longhornio/longhorn-manager:v1.5.1 + image: longhornio/longhorn-manager:v1.5.5 command: ['sh', '-c', 'while [ $(curl -m 1 -s -o /dev/null -w "%{http_code}" http://longhorn-backend:9500/v1) != "200" ]; do echo waiting; sleep 2; done'] containers: - name: longhorn-driver-deployer - image: longhornio/longhorn-manager:v1.5.1 + image: longhornio/longhorn-manager:v1.5.5 imagePullPolicy: IfNotPresent command: - longhorn-manager - -d - deploy-driver - --manager-image - - "longhornio/longhorn-manager:v1.5.1" + - "longhornio/longhorn-manager:v1.5.5" - --manager-url - http://longhorn-backend:9500/v1 env: @@ -4236,17 +4279,17 @@ spec: fieldRef: fieldPath: spec.serviceAccountName - name: CSI_ATTACHER_IMAGE - value: "longhornio/csi-attacher:v4.2.0" + value: "longhornio/csi-attacher:v4.4.2" - name: CSI_PROVISIONER_IMAGE - value: "longhornio/csi-provisioner:v3.4.1" + value: "longhornio/csi-provisioner:v3.6.2" - name: CSI_NODE_DRIVER_REGISTRAR_IMAGE - value: "longhornio/csi-node-driver-registrar:v2.7.0" + value: "longhornio/csi-node-driver-registrar:v2.9.2" - name: CSI_RESIZER_IMAGE - value: "longhornio/csi-resizer:v1.7.0" + value: "longhornio/csi-resizer:v1.9.2" - name: CSI_SNAPSHOTTER_IMAGE - value: "longhornio/csi-snapshotter:v6.2.1" + value: "longhornio/csi-snapshotter:v6.3.2" - name: CSI_LIVENESS_PROBE_IMAGE - value: "longhornio/livenessprobe:v2.9.0" + value: "longhornio/livenessprobe:v2.12.0" serviceAccountName: longhorn-service-account securityContext: runAsUser: 0 @@ -4258,7 +4301,7 @@ metadata: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 app: longhorn-ui name: longhorn-ui namespace: longhorn-system @@ -4272,7 +4315,7 @@ spec: labels: app.kubernetes.io/name: longhorn app.kubernetes.io/instance: longhorn - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.5 app: longhorn-ui spec: affinity: @@ -4289,7 +4332,7 @@ spec: topologyKey: kubernetes.io/hostname containers: - name: longhorn-ui - image: longhornio/longhorn-ui:v1.5.1 + image: longhornio/longhorn-ui:v1.5.5 imagePullPolicy: IfNotPresent volumeMounts: - name : nginx-cache diff --git a/longhorn-system/changes.diff b/longhorn-system/changes.diff index a62b298..2484505 100644 --- a/longhorn-system/changes.diff +++ b/longhorn-system/changes.diff @@ -16,6 +16,7 @@ - dataLocality: "disabled" + fsType: "xfs" + dataLocality: "best-effort" + unmapMarkSnapChainRemoved: "ignored" --- # Source: longhorn/templates/crds.yaml apiVersion: apiextensions.k8s.io/v1