Skip to content

CSI-1816 CSI-1704 update sidecars for 1.4.0 #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 24, 2020
Merged

CSI-1816 CSI-1704 update sidecars for 1.4.0 #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c86297b
update sidecars location, arch and version
Oct 14, 2020
9136455
update attacher cluster role
Nov 8, 2020
378ffb5
operator permissions to grant attacher permissions
Nov 9, 2020
aad53f7
add provisioner permissions
Nov 9, 2020
b10bedf
remove unnecessary snapshotter permissions
Nov 9, 2020
37ef07b
explicitly keep ext4 as default fstype
Nov 10, 2020
a61fa09
Merge branch 'develop' into update/CSI-1816-1704_sidecars
Nov 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions deploy/crds/csi.ibm.com_v1_ibmblockcsi_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ metadata:
app.kubernetes.io/managed-by: ibm-block-csi-operator
release: v1.4.0
spec:
# controller is a statefulSet with ibm-block-csi-driver-controller
# container and csi-provisioner, csi-attacher and livenessprobe sidecars.
# controller is a statefulSet with ibm-block-csi-controller container
# and csi-provisioner, csi-attacher, csi-snapshotter and livenessprobe sidecars.
controller:
repository: ibmcom/ibm-block-csi-driver-controller
tag: "1.4.0"
Expand All @@ -24,8 +24,10 @@ spec:
operator: In
values:
- amd64
- s390x
- ppc64le

# node is a daemonSet with ibm-block-csi-driver-node container
# node is a daemonSet with ibm-block-csi-node container
# and csi-node-driver-registrar and livenessprobe sidecars.
node:
repository: ibmcom/ibm-block-csi-driver-node
Expand All @@ -40,6 +42,8 @@ spec:
operator: In
values:
- amd64
- s390x
- ppc64le

# tolerations:
# - effect: NoSchedule
Expand All @@ -48,24 +52,24 @@ spec:

sidecars:
- name: csi-node-driver-registrar
repository: quay.io/k8scsi/csi-node-driver-registrar
tag: "v1.2.0"
repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
tag: "v2.0.1"
imagePullPolicy: IfNotPresent
- name: csi-provisioner
repository: quay.io/k8scsi/csi-provisioner
tag: "v1.6.0"
repository: k8s.gcr.io/sig-storage/csi-provisioner
tag: "v2.0.2"
imagePullPolicy: IfNotPresent
- name: csi-attacher
repository: quay.io/k8scsi/csi-attacher
tag: "v2.2.0"
repository: k8s.gcr.io/sig-storage/csi-attacher
tag: "v3.0.0"
imagePullPolicy: IfNotPresent
- name: csi-snapshotter
repository: quay.io/k8scsi/csi-snapshotter
tag: "v2.1.0"
repository: k8s.gcr.io/sig-storage/csi-snapshotter
tag: "v3.0.0"
imagePullPolicy: IfNotPresent
- name: livenessprobe
repository: quay.io/k8scsi/livenessprobe
tag: "v2.0.0"
repository: k8s.gcr.io/sig-storage/livenessprobe
tag: "v2.1.0"
imagePullPolicy: IfNotPresent

# imagePullSecrets:
Expand Down
67 changes: 0 additions & 67 deletions deploy/crds/csi.ibm.com_v1_ibmblockcsi_cr_ocp.yaml
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions deploy/installer/generated/ibm-block-csi-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1598,6 +1598,12 @@ rules:
- watch
- update
- patch
- apiGroups:
- storage.k8s.io
resources:
- volumeattachments/status
verbs:
- patch
- apiGroups:
- storage.k8s.io
resources:
Expand Down Expand Up @@ -1697,12 +1703,6 @@ rules:
- watch
- list
- update
- apiGroups:
- snapshot.storage.k8s.io
resources:
- volumesnapshots/status
verbs:
- update

---
kind: ClusterRoleBinding
Expand Down
38 changes: 20 additions & 18 deletions ...ock-csi-operator-community/1.4.0/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ metadata:
"operator": "In",
"values": [
"amd64",
"s390x"
"s390x",
"ppc64le"
]
}
]
Expand All @@ -61,7 +62,8 @@ metadata:
"operator": "In",
"values": [
"amd64",
"s390x"
"s390x",
"ppc64le"
]
}
]
Expand All @@ -74,32 +76,32 @@ metadata:
"sidecars": [
{
"name": "csi-node-driver-registrar",
"repository": "quay.io/k8scsi/csi-node-driver-registrar",
"tag": "v1.2.0",
"repository": "k8s.gcr.io/sig-storage/csi-node-driver-registrar",
"tag": "v2.0.1",
"imagePullPolicy": "IfNotPresent"
},
{
"name": "csi-provisioner",
"repository": "quay.io/k8scsi/csi-provisioner",
"tag": "v1.6.0",
"repository": "k8s.gcr.io/sig-storage/csi-provisioner",
"tag": "v2.0.2",
"imagePullPolicy": "IfNotPresent"
},
{
"name": "csi-attacher",
"repository": "quay.io/k8scsi/csi-attacher",
"tag": "v2.2.0",
"repository": "k8s.gcr.io/sig-storage/csi-attacher",
"tag": "v3.0.0",
"imagePullPolicy": "IfNotPresent"
},
{
"name": "csi-snapshotter",
"repository": "quay.io/k8scsi/csi-snapshotter",
"tag": "v2.1.0",
"repository": "k8s.gcr.io/sig-storage/csi-snapshotter",
"tag": "v3.0.0",
"imagePullPolicy": "IfNotPresent"
},
{
"name": "livenessprobe",
"repository": "quay.io/k8scsi/livenessprobe",
"tag": "v2.0.0",
"repository": "k8s.gcr.io/sig-storage/livenessprobe",
"tag": "v2.1.0",
"imagePullPolicy": "IfNotPresent"
}
]
Expand Down Expand Up @@ -600,6 +602,12 @@ spec:
- watch
- update
- patch
- apiGroups:
- storage.k8s.io
resources:
- volumeattachments/status
verbs:
- patch
- apiGroups:
- storage.k8s.io
resources:
Expand Down Expand Up @@ -699,12 +707,6 @@ spec:
- watch
- list
- update
- apiGroups:
- snapshot.storage.k8s.io
resources:
- volumesnapshots/status
verbs:
- update

deployments:
- name: ibm-block-csi-operator
Expand Down
32 changes: 16 additions & 16 deletions ...m-catalog/ibm-block-csi-operator/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,32 +74,32 @@ metadata:
"sidecars": [
{
"name": "csi-node-driver-registrar",
"repository": "registry.redhat.io/openshift4/ose-csi-driver-registrar",
"tag": "v4.3",
"repository": "k8s.gcr.io/sig-storage/csi-node-driver-registrar",
"tag": "v2.0.1",
"imagePullPolicy": "IfNotPresent"
},
{
"name": "csi-provisioner",
"repository": "registry.redhat.io/openshift4/ose-csi-external-provisioner-rhel7",
"tag": "v4.4",
"repository": "k8s.gcr.io/sig-storage/csi-provisioner",
"tag": "v2.0.2",
"imagePullPolicy": "IfNotPresent"
},
{
"name": "csi-attacher",
"repository": "registry.redhat.io/openshift4/ose-csi-external-attacher",
"tag": "v4.4",
"repository": "k8s.gcr.io/sig-storage/csi-attacher",
"tag": "v3.0.0",
"imagePullPolicy": "IfNotPresent"
},
{
"name": "csi-snapshotter",
"repository": "registry.redhat.io/openshift4/ose-csi-external-snapshotter-rhel7",
"tag": "v4.4",
"repository": "k8s.gcr.io/sig-storage/csi-snapshotter",
"tag": "v3.0.0",
"imagePullPolicy": "IfNotPresent"
},
{
"name": "livenessprobe",
"repository": "registry.redhat.io/openshift4/ose-csi-livenessprobe",
"tag": "v4.4",
"repository": "k8s.gcr.io/sig-storage/livenessprobe",
"tag": "v2.1.0",
"imagePullPolicy": "IfNotPresent"
}
]
Expand Down Expand Up @@ -600,6 +600,12 @@ spec:
- watch
- update
- patch
- apiGroups:
- storage.k8s.io
resources:
- volumeattachments/status
verbs:
- patch
- apiGroups:
- storage.k8s.io
resources:
Expand Down Expand Up @@ -699,12 +705,6 @@ spec:
- watch
- list
- update
- apiGroups:
- snapshot.storage.k8s.io
resources:
- volumesnapshots/status
verbs:
- update

deployments:
- name: ibm-block-csi-operator
Expand Down
12 changes: 6 additions & 6 deletions deploy/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ rules:
- watch
- update
- patch
- apiGroups:
- storage.k8s.io
resources:
- volumeattachments/status
verbs:
- patch
- apiGroups:
- storage.k8s.io
resources:
Expand Down Expand Up @@ -209,9 +215,3 @@ rules:
- watch
- list
- update
- apiGroups:
- snapshot.storage.k8s.io
resources:
- volumesnapshots/status
verbs:
- update
2 changes: 1 addition & 1 deletion pkg/controller/ibmblockcsi/syncer/csi_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func (s *csiControllerSyncer) ensureContainersSpec() []corev1.Container {
provisioner := s.ensureContainer(provisionerContainerName,
s.getCSIProvisionerImage(),
// TODO: make timeout configurable
[]string{"--csi-address=$(ADDRESS)", "--v=5", "--timeout=30s"},
[]string{"--csi-address=$(ADDRESS)", "--v=5", "--timeout=30s", "--default-fstype=ext4"},
)
provisioner.ImagePullPolicy = s.getCSIProvisionerPullPolicy()

Expand Down
Loading