From cb33e40d8219c8cf0e79098ab4b1af96ba2de23c Mon Sep 17 00:00:00 2001 From: Ceph Jenkins Date: Mon, 11 Nov 2024 03:04:43 -0500 Subject: [PATCH] bundle: add generated bundle changes that other commits bring add generated bundle changes Signed-off-by: Ceph Jenkins --- ...ephcsi-operator.clusterserviceversion.yaml | 44 +++++++++++++++- bundle/manifests/csi.ceph.io_drivers.yaml | 52 +++++++++++++++++++ .../csi.ceph.io_operatorconfigs.yaml | 52 +++++++++++++++++++ 3 files changed, 147 insertions(+), 1 deletion(-) diff --git a/bundle/manifests/cephcsi-operator.clusterserviceversion.yaml b/bundle/manifests/cephcsi-operator.clusterserviceversion.yaml index b8bc66f0..1d5eb658 100644 --- a/bundle/manifests/cephcsi-operator.clusterserviceversion.yaml +++ b/bundle/manifests/cephcsi-operator.clusterserviceversion.yaml @@ -4,7 +4,7 @@ metadata: annotations: alm-examples: '[]' capabilities: Basic Install - createdAt: "2024-11-06T08:04:38Z" + createdAt: "2024-11-11T08:04:43Z" olm.skipRange: "" operators.operatorframework.io/builder: operator-sdk-v1.34.1 operators.operatorframework.io/operator-type: non-standalone @@ -857,7 +857,21 @@ spec: resources: - csiaddonsnodes verbs: + - get - create + - update + - apiGroups: + - "" + resources: + - pods + verbs: + - get + - apiGroups: + - apps + resources: + - replicasets + verbs: + - get serviceAccountName: ceph-csi-cephfs-ctrlplugin-sa - rules: - apiGroups: @@ -909,7 +923,21 @@ spec: resources: - csiaddonsnodes verbs: + - get - create + - update + - apiGroups: + - "" + resources: + - pods + verbs: + - get + - apiGroups: + - apps + resources: + - replicasets + verbs: + - get serviceAccountName: ceph-csi-rbd-ctrlplugin-sa - rules: - apiGroups: @@ -917,7 +945,21 @@ spec: resources: - csiaddonsnodes verbs: + - get - create + - update + - apiGroups: + - "" + resources: + - pods + verbs: + - get + - apiGroups: + - apps + resources: + - replicasets + verbs: + - get serviceAccountName: ceph-csi-rbd-nodeplugin-sa strategy: deployment installModes: diff --git a/bundle/manifests/csi.ceph.io_drivers.yaml b/bundle/manifests/csi.ceph.io_drivers.yaml index 4750baaa..9a41f72d 100644 --- a/bundle/manifests/csi.ceph.io_drivers.yaml +++ b/bundle/manifests/csi.ceph.io_drivers.yaml @@ -999,6 +999,58 @@ spec: type: string description: Pod's annotations type: object + deploymentStrategy: + description: |- + DeploymentStrategy describes how to replace existing pods with new ones + Default value is RollingUpdate with MaxUnavailable and MaxSurege as 25% (kubernetes default) + properties: + rollingUpdate: + description: |- + Rolling update config params. Present only if DeploymentStrategyType = + RollingUpdate. + --- + TODO: Update this to follow our convention for oneOf, whatever we decide it + to be. + properties: + maxSurge: + anyOf: + - type: integer + - type: string + description: |- + The maximum number of pods that can be scheduled above the desired number of + pods. + Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). + This can not be 0 if MaxUnavailable is 0. + Absolute number is calculated from percentage by rounding up. + Defaults to 25%. + Example: when this is set to 30%, the new ReplicaSet can be scaled up immediately when + the rolling update starts, such that the total number of old and new pods do not exceed + 130% of desired pods. Once old pods have been killed, + new ReplicaSet can be scaled up further, ensuring that total number of pods running + at any time during the update is at most 130% of desired pods. + x-kubernetes-int-or-string: true + maxUnavailable: + anyOf: + - type: integer + - type: string + description: |- + The maximum number of pods that can be unavailable during the update. + Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). + Absolute number is calculated from percentage by rounding down. + This can not be 0 if MaxSurge is 0. + Defaults to 25%. + Example: when this is set to 30%, the old ReplicaSet can be scaled down to 70% of desired pods + immediately when the rolling update starts. Once new pods are ready, old ReplicaSet + can be scaled down further, followed by scaling up the new ReplicaSet, ensuring + that the total number of pods available at all times during the update is at + least 70% of desired pods. + x-kubernetes-int-or-string: true + type: object + type: + description: Type of deployment. Can be "Recreate" or "RollingUpdate". + Default is RollingUpdate. + type: string + type: object imagePullPolicy: description: To indicate the image pull policy to be applied to all the containers in the csi driver pods. diff --git a/bundle/manifests/csi.ceph.io_operatorconfigs.yaml b/bundle/manifests/csi.ceph.io_operatorconfigs.yaml index 6f81d8ae..c9fbcb7d 100644 --- a/bundle/manifests/csi.ceph.io_operatorconfigs.yaml +++ b/bundle/manifests/csi.ceph.io_operatorconfigs.yaml @@ -1008,6 +1008,58 @@ spec: type: string description: Pod's annotations type: object + deploymentStrategy: + description: |- + DeploymentStrategy describes how to replace existing pods with new ones + Default value is RollingUpdate with MaxUnavailable and MaxSurege as 25% (kubernetes default) + properties: + rollingUpdate: + description: |- + Rolling update config params. Present only if DeploymentStrategyType = + RollingUpdate. + --- + TODO: Update this to follow our convention for oneOf, whatever we decide it + to be. + properties: + maxSurge: + anyOf: + - type: integer + - type: string + description: |- + The maximum number of pods that can be scheduled above the desired number of + pods. + Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). + This can not be 0 if MaxUnavailable is 0. + Absolute number is calculated from percentage by rounding up. + Defaults to 25%. + Example: when this is set to 30%, the new ReplicaSet can be scaled up immediately when + the rolling update starts, such that the total number of old and new pods do not exceed + 130% of desired pods. Once old pods have been killed, + new ReplicaSet can be scaled up further, ensuring that total number of pods running + at any time during the update is at most 130% of desired pods. + x-kubernetes-int-or-string: true + maxUnavailable: + anyOf: + - type: integer + - type: string + description: |- + The maximum number of pods that can be unavailable during the update. + Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). + Absolute number is calculated from percentage by rounding down. + This can not be 0 if MaxSurge is 0. + Defaults to 25%. + Example: when this is set to 30%, the old ReplicaSet can be scaled down to 70% of desired pods + immediately when the rolling update starts. Once new pods are ready, old ReplicaSet + can be scaled down further, followed by scaling up the new ReplicaSet, ensuring + that the total number of pods available at all times during the update is at + least 70% of desired pods. + x-kubernetes-int-or-string: true + type: object + type: + description: Type of deployment. Can be "Recreate" or + "RollingUpdate". Default is RollingUpdate. + type: string + type: object imagePullPolicy: description: To indicate the image pull policy to be applied to all the containers in the csi driver pods.