Skip to content

Commit 9f1992e

Browse files
yorchpaveJorge Padilla
andauthored
changes for 2.10.5 and UBI lockdown (#1237)
Signed-off-by: Jorge Padilla <[email protected]> Co-authored-by: Jorge Padilla <[email protected]>
1 parent 7c16c2d commit 9f1992e

File tree

16 files changed

+43
-48
lines changed

16 files changed

+43
-48
lines changed

cloudpak/stable/ibm-spectrum-scale-csi-operator-bundle/case/ibm-spectrum-scale-csi-operator/case.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: ibm-spectrum-scale-csi-operator
22
specVersion: 1.0.0
3-
version: 2.10.4
4-
appVersion: 2.10.4
3+
version: 2.10.5
4+
appVersion: 2.10.5
55
description: "Represents a deployment of the IBM CSI Storage Scale driver."
6-
displayName: "IBM CSI Storage Scale Driver CASE"
6+
displayName: "IBM CSI Storage Scale Driver CASE"
77
displayDescription: "Represents a deployment of the IBM CSI Storage Scale driver."
88
icons:
99
- base64: PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMzIgMzIiPgogIDxkZWZzPgogICAgPGxpbmVhckdyYWRpZW50IGlkPSJiMzczZDkxNi0zNWQzLTQ4NDAtOWI5Ni1jMWFhNzkyNTI4NzYiIHgxPSIxLjcxIiB5MT0iMjIuNTAyIiB4Mj0iMTcuMjkiIHkyPSIzMS40OTgiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj4KICAgICAgPHN0b3Agb2Zmc2V0PSIwLjIiIHN0b3Atb3BhY2l0eT0iMCIvPgogICAgICA8c3RvcCBvZmZzZXQ9IjAuNiIvPgogICAgPC9saW5lYXJHcmFkaWVudD4KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0iZjZmYjQ4MDgtMDdjYS00N2RlLWI5NjYtYjkzZTQ4YWQwNGZhIiB4MT0iMzU0MS41IiB5MT0iMjciIHgyPSIzNTQxLjUiIHkyPSIxOCIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCgxLCAwLCAwLCAtMSwgLTM1MjAsIDQ1KSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPgogICAgICA8c3RvcCBvZmZzZXQ9IjAuMiIvPgogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3Atb3BhY2l0eT0iMCIvPgogICAgPC9saW5lYXJHcmFkaWVudD4KICAgIDxtYXNrIGlkPSJhZjgzNjFhYy05Y2M3LTRmN2ItYjExMi0wM2Q3ZDdhOTE0NTQiIHg9IjAiIHk9IjAiIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgbWFza1VuaXRzPSJ1c2VyU3BhY2VPblVzZSI+CiAgICAgIDxwYXRoIGQ9Ik0xNS41LDMwLjg2NGwtMTItN0ExLDEsMCwwLDEsMywyM1Y5YTEsMSwwLDAsMSwuNS0uODY0bDEyLTdhMSwxLDAsMCwxLDEuMDA4LDBsMTIsN0ExLDEsMCwwLDEsMjksOVYyM0gyN1Y5LjU3NEwxNiwzLjE1OCw1LDkuNTc0VjIyLjQyNmwxMS41LDYuNzFaIiBmaWxsPSIjZmZmIi8+CiAgICAgIDxyZWN0IHg9IjIiIHk9IjIyIiB3aWR0aD0iMTUiIGhlaWdodD0iMTAiIGZpbGw9InVybCgjYjM3M2Q5MTYtMzVkMy00ODQwLTliOTYtYzFhYTc5MjUyODc2KSIvPgogICAgICA8cGF0aCBkPSJNMjEsMjUuNWgydi05YTEsMSwwLDAsMC0uNS0uODY0bC02LTMuNWExLDEsMCwwLDAtMS4wMDgsMGwtNiwzLjVBMSwxLDAsMCwwLDksMTYuNVYyMWgyVjE3LjA3NGw1LTIuOTE2LDUsMi45MTZaIiBmaWxsPSIjZmZmIi8+CiAgICAgIDxyZWN0IHg9IjE5IiB5PSIxOCIgd2lkdGg9IjUiIGhlaWdodD0iOSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNDMgNDUpIHJvdGF0ZSgxODApIiBmaWxsPSJ1cmwoI2Y2ZmI0ODA4LTA3Y2EtNDdkZS1iOTY2LWI5M2U0OGFkMDRmYSkiLz4KICAgIDwvbWFzaz4KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0iYWY4YWM3NjAtNzY5YS00MDc4LWI2ZmUtYTlmOGRjMzU3OThjIiB5MT0iMzIiIHgyPSIzMiIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPgogICAgICA8c3RvcCBvZmZzZXQ9IjAuMSIgc3RvcC1jb2xvcj0iIzQyYmU2NSIvPgogICAgICA8c3RvcCBvZmZzZXQ9IjAuOSIgc3RvcC1jb2xvcj0iIzAwN2Q3OSIvPgogICAgPC9saW5lYXJHcmFkaWVudD4KICA8L2RlZnM+CiAgPGcgaWQ9ImI0ODI0ZTUxLWRmMWMtNDdmMS1iMTc4LTQzZjYyOTUwYmJiNSIgZGF0YS1uYW1lPSJMYXllciAyIj4KICAgIDxnIGlkPSJiZjg4ZTFmMy1hYWFiLTRjNWEtYWVlYi02NDU2OTJiYWMxY2UiIGRhdGEtbmFtZT0iTGlnaHQgdGhlbWUgaWNvbnMiPgogICAgICA8Zz4KICAgICAgICA8ZyBtYXNrPSJ1cmwoI2FmODM2MWFjLTljYzctNGY3Yi1iMTEyLTAzZDdkN2E5MTQ1NCkiPgogICAgICAgICAgPHJlY3Qgd2lkdGg9IjMyIiBoZWlnaHQ9IjMyIiBmaWxsPSJ1cmwoI2FmOGFjNzYwLTc2OWEtNDA3OC1iNmZlLWE5ZjhkYzM1Nzk4YykiLz4KICAgICAgICA8L2c+CiAgICAgICAgPHBhdGggZD0iTTE2LDMxYTEsMSwwLDAsMS0uNS0uMTM2bC0zLTEuNzVhMSwxLDAsMCwxLS41LS44NjR2LTMuNWExLDEsMCwwLDEsLjUtLjg2NGwzLTEuNzVhMSwxLDAsMCwxLDEuMDA4LDBsMywxLjc1YTEsMSwwLDAsMSwuNS44NjR2My41YTEsMSwwLDAsMS0uNS44NjRsLTMsMS43NUExLDEsMCwwLDEsMTYsMzFabS0yLTMuMzI0LDIsMS4xNjYsMi0xLjE2NlYyNS4zMjRsLTItMS4xNjYtMiwxLjE2NloiIGZpbGw9IiMwMDFkNmMiLz4KICAgICAgPC9nPgogICAgPC9nPgogIDwvZz4KPC9zdmc+Cg==

cloudpak/stable/ibm-spectrum-scale-csi-operator-bundle/case/ibm-spectrum-scale-csi-operator/inventory/ibmCSIScaleOperator/resources.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resources:
99
- metadata:
1010
name: ibm_spectrum_scale_csi_driver
1111
image: cp/spectrum/scale/csi/ibm-spectrum-scale-csi-driver
12-
tag: v2.10.4
12+
tag: v2.10.5
1313
digest: sha256:57b4ee494ca48342d1ffaf22a166286202b0406b88316e4dcbe87212df6ca8f0
1414
mediaType: application/vnd.docker.distribution.manifest.list.v2
1515
registries:
@@ -20,19 +20,19 @@ resources:
2020
platform:
2121
architecture: amd64
2222
os: linux
23-
tag: v2.10.4-amd64
23+
tag: v2.10.5-amd64
2424
- digest: sha256:4bcdd8eccc13908d8b6c9c21b4ffed63177c53b410d7d50a2bd036ff8398ef46
2525
mediaType: application/vnd.docker.distribution.manifest.v2
2626
platform:
2727
architecture: ppc64le
2828
os: linux
29-
tag: v2.10.4-ppc64le
29+
tag: v2.10.5-ppc64le
3030
- digest: sha256:17d0601ca92224d38abc78a6a5771827ef130a49379270e536b3ca26cc9fc89f
3131
mediaType: application/vnd.docker.distribution.manifest.v2
3232
platform:
3333
architecture: s390x
3434
os: linux
35-
tag: v2.10.4-s390x
35+
tag: v2.10.5-s390x
3636

3737
- metadata:
3838
name: csi_snapshotter
@@ -61,10 +61,10 @@ resources:
6161
architecture: s390x
6262
os: linux
6363
tag: v6.2.2-s390x
64-
64+
6565
- metadata:
6666
name: csi_provisioner
67-
image: cp/spectrum/scale/csi/csi-provisioner
67+
image: cp/spectrum/scale/csi/csi-provisioner
6868
tag: v3.5.0
6969
digest: sha256:d078dc174323407e8cc6f0f9abd4efaac5db27838f1564d0253d5e3233e3f17f
7070
mediaType: application/vnd.docker.distribution.manifest.list.v2
@@ -120,7 +120,7 @@ resources:
120120

121121
- metadata:
122122
name: csi_node_driver_registrar
123-
image: cp/spectrum/scale/csi/csi-node-driver-registrar
123+
image: cp/spectrum/scale/csi/csi-node-driver-registrar
124124
tag: v2.8.0
125125
digest: sha256:f6717ce72a2615c7fbc746b4068f788e78579c54c43b8716e5ce650d97af2df1
126126
mediaType: application/vnd.docker.distribution.manifest.list.v2

cloudpak/stable/ibm-spectrum-scale-csi-operator-bundle/case/ibm-spectrum-scale-csi-operator/inventory/ibmCSIScaleOperatorSetup/resources.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resources:
99
- metadata:
1010
name: ibm_spectrum_scale_csi_operator
1111
image: cpopen/ibm-spectrum-scale-csi-operator
12-
tag: v2.10.4
12+
tag: v2.10.5
1313
digest: sha256:e3d2f9fb68b2d7cd1faf84002bb73626da10bed5d81f91945a592d41893e2fda
1414
mediaType: application/vnd.docker.distribution.manifest.list.v2
1515
registries:
@@ -20,19 +20,19 @@ resources:
2020
platform:
2121
architecture: amd64
2222
os: linux
23-
tag: v2.10.4-amd64
23+
tag: v2.10.5-amd64
2424
- digest: sha256:4d2ddb810b219aa0caf3e581d1c811dea6deefc1c491f09ff3d68b33b7875434
2525
mediaType: application/vnd.docker.distribution.manifest.v2
2626
platform:
2727
architecture: ppc64le
2828
os: linux
29-
tag: v2.10.4-ppc64le
29+
tag: v2.10.5-ppc64le
3030
- digest: sha256:e299883ecd8932ca2b245246f91f7111c35de1dd0469f0daae2c7e71ee9ea7a1
3131
mediaType: application/vnd.docker.distribution.manifest.v2
3232
platform:
3333
architecture: s390x
3434
os: linux
35-
tag: v2.10.4-s390x
35+
tag: v2.10.5-s390x
3636
files:
3737
- mediaType: application/vnd.case.resource.k8s.v1+yaml
3838
ref: cluster/deploy/crds/csi_v1_csiscaleoperator.yaml

driver/build/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ ENV REVISION $commit
2020
RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -a -ldflags "-X 'main.gitCommit=${REVISION}' -extldflags '-static'" -o _output/ibm-spectrum-scale-csi ./cmd/ibm-spectrum-scale-csi
2121
# RUN chmod +x,u+s _output/ibm-spectrum-scale-csi
2222

23-
FROM registry.access.redhat.com/ubi9-minimal:9.4-1194
24-
ARG version=2.10.4
23+
FROM registry.access.redhat.com/ubi9-minimal:9.4-1227.1726694542
24+
ARG version=2.10.5
2525
ARG commit
2626
ARG build_date
2727

driver/cmd/ibm-spectrum-scale-csi/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ var (
4141
driverName = flag.String("drivername", "spectrumscale.csi.ibm.com", "name of the driver")
4242
nodeID = flag.String("nodeid", "", "node id")
4343
kubeletRootDir = flag.String("kubeletRootDirPath", "/var/lib/kubelet", "kubelet root directory path")
44-
vendorVersion = "2.10.4"
44+
vendorVersion = "2.10.5"
4545
)
4646

4747
func main() {

generated/installer/ibm-spectrum-scale-csi-operator-dev.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
product: ibm-spectrum-scale-csi
1111
release: ibm-spectrum-scale-csi-operator
1212
annotations:
13-
productVersion: 2.10.4
13+
productVersion: 2.10.5
1414
spec:
1515
replicas: 1
1616
selector:
@@ -28,7 +28,7 @@ spec:
2828
annotations:
2929
productID: ibm-spectrum-scale-csi-operator
3030
productName: IBM Spectrum Scale CSI Operator
31-
productVersion: 2.10.4
31+
productVersion: 2.10.5
3232
spec:
3333
serviceAccountName: ibm-spectrum-scale-csi-operator
3434
containers:

generated/installer/ibm-spectrum-scale-csi-operator-ocp-rhel.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
product: ibm-spectrum-scale-csi
1111
release: ibm-spectrum-scale-csi-operator
1212
annotations:
13-
productVersion: 2.10.4
13+
productVersion: 2.10.5
1414
spec:
1515
replicas: 1
1616
selector:
@@ -28,12 +28,12 @@ spec:
2828
annotations:
2929
productID: ibm-spectrum-scale-csi-operator
3030
productName: IBM Spectrum Scale CSI Operator
31-
productVersion: 2.10.4
31+
productVersion: 2.10.5
3232
spec:
3333
serviceAccountName: ibm-spectrum-scale-csi-operator
3434
containers:
3535
- name: operator
36-
image: quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-operator@sha256:541446387c4943446999869432dbcf403d4e7af93469f0dc1b7d5c1dc6979253
36+
image: quay.io/ibm-spectrum-scale-dev/ibm-spectrum-scale-csi-operator@sha256:541446387c4943446999869432dbcf403d4e7af93469f0dc1b7d5c1dc6979253
3737
args:
3838
- --leaderElection=true
3939
env:
@@ -44,7 +44,7 @@ spec:
4444
fieldRef:
4545
fieldPath: metadata.namespace
4646
- name: CSI_DRIVER_IMAGE
47-
value: quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-driver@sha256:8c47aef365d6a96bf70a89761162624d0c10004d253e1460db209dd86e6a265c
47+
value: quay.io/ibm-spectrum-scale-dev/ibm-spectrum-scale-csi-driver@sha256:8c47aef365d6a96bf70a89761162624d0c10004d253e1460db209dd86e6a265c
4848
resources:
4949
limits:
5050
cpu: 600m

generated/installer/ibm-spectrum-scale-csi-operator.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
product: ibm-spectrum-scale-csi
1111
release: ibm-spectrum-scale-csi-operator
1212
annotations:
13-
productVersion: 2.10.4
13+
productVersion: 2.10.5
1414
spec:
1515
replicas: 1
1616
selector:
@@ -28,12 +28,12 @@ spec:
2828
annotations:
2929
productID: ibm-spectrum-scale-csi-operator
3030
productName: IBM Spectrum Scale CSI Operator
31-
productVersion: 2.10.4
31+
productVersion: 2.10.5
3232
spec:
3333
serviceAccountName: ibm-spectrum-scale-csi-operator
3434
containers:
3535
- name: operator
36-
image: quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-operator@sha256:541446387c4943446999869432dbcf403d4e7af93469f0dc1b7d5c1dc6979253
36+
image: quay.io/ibm-spectrum-scale-dev/ibm-spectrum-scale-csi-operator@sha256:541446387c4943446999869432dbcf403d4e7af93469f0dc1b7d5c1dc6979253
3737
args:
3838
- --leaderElection=true
3939
env:
@@ -44,7 +44,7 @@ spec:
4444
fieldRef:
4545
fieldPath: metadata.namespace
4646
- name: CSI_DRIVER_IMAGE
47-
value: quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-driver@sha256:8c47aef365d6a96bf70a89761162624d0c10004d253e1460db209dd86e6a265c
47+
value: quay.io/ibm-spectrum-scale-dev/ibm-spectrum-scale-csi-driver@sha256:8c47aef365d6a96bf70a89761162624d0c10004d253e1460db209dd86e6a265c
4848
resources:
4949
limits:
5050
cpu: 600m

operator/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# To re-generate a bundle for another specific version without changing the standard setup, you can:
44
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
55
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
6-
VERSION ?= 2.10.4
6+
VERSION ?= 2.10.5
77

88
# CHANNELS define the bundle channels used in the bundle.
99
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")
@@ -101,9 +101,9 @@ fmt: ## Run go fmt against code.
101101
go fmt ./...
102102
go mod tidy
103103

104-
## TODO: GoLint is deprecated, should look for alternatives.
104+
## TODO: GoLint is deprecated, should look for alternatives.
105105
## More info: https://github.com/golang/go/issues/38968
106-
lint: golangci-lint ## Run go lint against code.
106+
lint: golangci-lint ## Run go lint against code.
107107
@echo "****** LINTING ******"
108108
$(GOLANGCI_LINT) run --no-config --disable-all -E golint > ./docs/dev/security/results.golint.txt 2>&1 || true
109109

operator/build/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RUN CGO_ENABLED=0 go build -ldflags="-X 'main.gitCommit=${REVISION}'" -a -o mana
3333
# Refer to https://github.com/GoogleContainerTools/distroless for more details
3434
FROM gcr.io/distroless/static:nonroot
3535
WORKDIR /
36-
ARG version=2.10.4
36+
ARG version=2.10.5
3737
ARG commit
3838
ARG build_date
3939

@@ -59,4 +59,3 @@ COPY --from=builder /workspace/manager .
5959
USER 65532:65532
6060

6161
ENTRYPOINT ["/manager"]
62-

0 commit comments

Comments
 (0)