Skip to content

Commit 23b8878

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request ceph#154 from red-hat-storage/sync_ds--main
Syncing latest changes from main for ceph-csi-operator
2 parents aa885b7 + d4d6fd2 commit 23b8878

File tree

419 files changed

+59957
-6283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

419 files changed

+59957
-6283
lines changed

‎.github/workflows/dependency-review.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
- name: 'Checkout Repository'
1212
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1313
- name: 'Dependency Review'
14-
uses: actions/dependency-review-action@38ecb5b593bf0eb19e335c03f97670f792489a8b # v4.7.0
14+
uses: actions/dependency-review-action@56339e523c0409420f6c2c9a2f4292bbb3c07dd3 # v4.8.0

‎.github/workflows/stale.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-22.04
2020
if: github.repository == 'ceph/ceph-csi-operator'
2121
steps:
22-
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
22+
- uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
2323
with:
2424
repo-token: ${{ secrets.GITHUB_TOKEN }}
2525
days-before-issue-stale: 60

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@ build-helm-installer: manifests generate kustomize helmify ## Generate helm char
203203
mkdir -p build deploy
204204
cd build && echo "$$BUILD_INSTALLER_OVERLAY" > kustomization.yaml
205205
cd build && $(KUSTOMIZE) edit add resource ../config/default/
206-
$(KUSTOMIZE) build build | $(HELMIFY) deploy/charts/ceph-csi-operator
206+
$(KUSTOMIZE) build build | $(HELMIFY) -image-pull-secrets deploy/charts/ceph-csi-operator
207+
hack/patch-sa-with-imgpullsecrets.sh deploy/charts/ceph-csi-operator
207208
rm -rf build
208209

209210
.PHONY: build-multifile-installer

‎api/v1/driver_types.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ type EncryptionSpec struct {
8989
}
9090

9191
type VolumeSpec struct {
92-
//+kubebuilder:validation:Required
92+
//+kubebuilder:validation:Optional
9393
Volume corev1.Volume `json:"volume,omitempty"`
9494

95-
//+kubebuilder:validation:Required
95+
//+kubebuilder:validation:Optional
9696
Mount corev1.VolumeMount `json:"mount,omitempty"`
9797
}
9898

@@ -216,7 +216,7 @@ type ControllerPluginSpec struct {
216216
PodCommonSpec `json:",inline"`
217217

218218
// DeploymentStrategy describes how to replace existing pods with new ones
219-
// Default value is RollingUpdate with MaxUnavailable and MaxSurege as 25% (kubernetes default)
219+
// Default value is Recreate
220220
//+kubebuilder:validation:Optional
221221
DeploymentStrategy *appsv1.DeploymentStrategy `json:"deploymentStrategy,omitempty"`
222222

‎bundle/manifests/cephcsi-operator.clusterserviceversion.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
alm-examples: '[]'
66
capabilities: Basic Install
7-
createdAt: "2025-09-22T08:05:02Z"
7+
createdAt: "2025-10-07T08:05:00Z"
88
olm.skipRange: ""
99
operators.operatorframework.io/builder: operator-sdk-v1.34.1
1010
operators.operatorframework.io/operator-type: non-standalone
@@ -61,6 +61,7 @@ spec:
6161
verbs:
6262
- get
6363
- list
64+
- watch
6465
- apiGroups:
6566
- ""
6667
resources:

‎bundle/manifests/csi.ceph.io_drivers.yaml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,7 @@ spec:
994994
deploymentStrategy:
995995
description: |-
996996
DeploymentStrategy describes how to replace existing pods with new ones
997-
Default value is RollingUpdate with MaxUnavailable and MaxSurege as 25% (kubernetes default)
997+
Default value is Recreate
998998
properties:
999999
rollingUpdate:
10001000
description: |-
@@ -3618,9 +3618,6 @@ spec:
36183618
required:
36193619
- name
36203620
type: object
3621-
required:
3622-
- mount
3623-
- volume
36243621
type: object
36253622
type: array
36263623
type: object
@@ -7119,9 +7116,6 @@ spec:
71197116
required:
71207117
- name
71217118
type: object
7122-
required:
7123-
- mount
7124-
- volume
71257119
type: object
71267120
type: array
71277121
type: object

‎bundle/manifests/csi.ceph.io_operatorconfigs.yaml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ spec:
10031003
deploymentStrategy:
10041004
description: |-
10051005
DeploymentStrategy describes how to replace existing pods with new ones
1006-
Default value is RollingUpdate with MaxUnavailable and MaxSurege as 25% (kubernetes default)
1006+
Default value is Recreate
10071007
properties:
10081008
rollingUpdate:
10091009
description: |-
@@ -3656,9 +3656,6 @@ spec:
36563656
required:
36573657
- name
36583658
type: object
3659-
required:
3660-
- mount
3661-
- volume
36623659
type: object
36633660
type: array
36643661
type: object
@@ -7188,9 +7185,6 @@ spec:
71887185
required:
71897186
- name
71907187
type: object
7191-
required:
7192-
- mount
7193-
- volume
71947188
type: object
71957189
type: array
71967190
type: object

‎config/crd/bases/csi.ceph.io_drivers.yaml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,7 @@ spec:
994994
deploymentStrategy:
995995
description: |-
996996
DeploymentStrategy describes how to replace existing pods with new ones
997-
Default value is RollingUpdate with MaxUnavailable and MaxSurege as 25% (kubernetes default)
997+
Default value is Recreate
998998
properties:
999999
rollingUpdate:
10001000
description: |-
@@ -3618,9 +3618,6 @@ spec:
36183618
required:
36193619
- name
36203620
type: object
3621-
required:
3622-
- mount
3623-
- volume
36243621
type: object
36253622
type: array
36263623
type: object
@@ -7119,9 +7116,6 @@ spec:
71197116
required:
71207117
- name
71217118
type: object
7122-
required:
7123-
- mount
7124-
- volume
71257119
type: object
71267120
type: array
71277121
type: object

‎config/crd/bases/csi.ceph.io_operatorconfigs.yaml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ spec:
10031003
deploymentStrategy:
10041004
description: |-
10051005
DeploymentStrategy describes how to replace existing pods with new ones
1006-
Default value is RollingUpdate with MaxUnavailable and MaxSurege as 25% (kubernetes default)
1006+
Default value is Recreate
10071007
properties:
10081008
rollingUpdate:
10091009
description: |-
@@ -3656,9 +3656,6 @@ spec:
36563656
required:
36573657
- name
36583658
type: object
3659-
required:
3660-
- mount
3661-
- volume
36623659
type: object
36633660
type: array
36643661
type: object
@@ -7188,9 +7185,6 @@ spec:
71887185
required:
71897186
- name
71907187
type: object
7191-
required:
7192-
- mount
7193-
- volume
71947188
type: object
71957189
type: array
71967190
type: object

‎config/csi-rbac/cephfs_ctrlplugin_cluster_role.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
rules:
66
- apiGroups: [""]
77
resources: ["secrets"]
8-
verbs: ["get", "list"]
8+
verbs: ["get", "list", "watch"]
99
- apiGroups: [""]
1010
resources: ["configmaps"]
1111
verbs: ["get"]

0 commit comments

Comments
 (0)