Skip to content

Commit c408dd3

Browse files
EvgenyUglovEvgenyUglov
authored
Use common CSM baseimage (#416)
* Use CSM baseimage * Fixing lint issues * Fixing lint issues * Fixing lint issues * Fixing lint issues
1 parent 8adf9b5 commit c408dd3

File tree

8 files changed

+32
-68
lines changed

8 files changed

+32
-68
lines changed

‎.github/workflows/go-version.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# Reusable workflow to perform go version update on Golang based projects
1010
name: Go Version Update
1111

12-
on:
12+
on: # yamllint disable-line rule:truthy
1313
workflow_dispatch:
1414
repository_dispatch:
1515
types: [go-update-workflow]

‎buildubimicro.sh‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎docker.mk‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,39 +36,27 @@ endif
3636
# set the GOVERSION
3737
export GOVERSION="1.21"
3838

39-
# Add 'build-base-image' as a dependency if UBI Micro is used as the base image.
40-
# This is required to load all the depedent packages into UBI Miro image.
41-
ifeq ($(DOCKER_FILE), docker-files/Dockerfile.ubi.micro)
42-
DEPENDENCIES=build-base-image
43-
endif
44-
4539
# figure out if podman or docker should be used (use podman if found)
4640
ifneq (, $(shell which podman 2>/dev/null))
4741
BUILDER=podman
4842
else
4943
BUILDER=docker
5044
endif
5145

52-
docker: $(DEPENDENCIES)
46+
docker: download-csm-common
5347
@echo "MAJOR $(MAJOR) MINOR $(MINOR) PATCH $(PATCH) RELNOTE $(RELNOTE) SEMVER $(SEMVER)"
5448
@echo "$(DOCKER_FILE)"
55-
$(BUILDER) build -f $(DOCKER_FILE) -t "$(DOCKER_REGISTRY)/$(DOCKER_IMAGE_NAME):v$(MAJOR).$(MINOR).$(PATCH)$(RELNOTE)" --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) --build-arg BASEIMAGE=$(BASEIMAGE) .
49+
$(BUILDER) build -f $(DOCKER_FILE) -t "$(DOCKER_REGISTRY)/$(DOCKER_IMAGE_NAME):v$(MAJOR).$(MINOR).$(PATCH)$(RELNOTE)" --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) --build-arg BASEIMAGE=$(CSM_BASEIMAGE) .
5650

57-
docker-no-cache: $(DEPENDENCIES)
51+
docker-no-cache: download-csm-common
5852
@echo "MAJOR $(MAJOR) MINOR $(MINOR) PATCH $(PATCH) RELNOTE $(RELNOTE) SEMVER $(SEMVER)"
5953
@echo "$(DOCKER_FILE) --no-cache"
60-
$(BUILDER) build --no-cache -f $(DOCKER_FILE) -t "$(DOCKER_REGISTRY)/$(DOCKER_IMAGE_NAME):v$(MAJOR).$(MINOR).$(PATCH)$(RELNOTE)" --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) --build-arg BASEIMAGE=$(BASEIMAGE) .
54+
$(BUILDER) build --no-cache -f $(DOCKER_FILE) -t "$(DOCKER_REGISTRY)/$(DOCKER_IMAGE_NAME):v$(MAJOR).$(MINOR).$(PATCH)$(RELNOTE)" --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) --build-arg BASEIMAGE=$(CSM_BASEIMAGE) .
6155

6256
push:
6357
echo "MAJOR $(MAJOR) MINOR $(MINOR) PATCH $(PATCH) RELNOTE $(RELNOTE) SEMVER $(SEMVER)"
6458
$(BUILDER) push "$(DOCKER_REGISTRY)/$(DOCKER_IMAGE_NAME):v$(MAJOR).$(MINOR).$(PATCH)$(RELNOTE)"
6559

66-
build-base-image: download-csm-common
67-
$(eval include csm-common.mk)
68-
@echo "Building base image from $(DEFAULT_BASEIMAGE) and loading dependencies..."
69-
./buildubimicro.sh $(DEFAULT_BASEIMAGE)
70-
@echo "Base image build: SUCCESS"
71-
$(eval BASEIMAGE=localhost/csipowerstore-ubimicro:latest)
72-
7360
download-csm-common:
7461
curl -O -L https://raw.githubusercontent.com/dell/csm/main/config/csm-common.mk
62+
$(eval include csm-common.mk)

‎samples/secret/secret.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
# kubectl create secret generic powerstore-config -n csi-powerstore --from-file=config=secret.yaml
2020
#
2121
arrays:
22-
# endpoint: full URL path to the PowerStore API
23-
# Allowed Values: https://*.*.*.*/api/rest or https://abc.com/api/rest
24-
# Default Value: None
22+
# endpoint: full URL path to the PowerStore API
23+
# Allowed Values: https://*.*.*.*/api/rest or https://abc.com/api/rest
24+
# Default Value: None
2525
- endpoint: "https://10.0.0.1/api/rest"
2626

2727
# globalID: unique id of the PowerStore array
@@ -84,10 +84,10 @@ arrays:
8484
# Default value: "0777"
8585
# nfsAcls: "0777"
8686

87-
# To add more PowerStore arrays, uncomment the following lines and provide the required values
88-
#- endpoint: "https://11.0.0.1/api/rest"
89-
# globalID: "unique"
90-
# username: "user"
91-
# password: "password"
92-
# skipCertificateValidation: true
93-
# blockProtocol: "FC"
87+
# To add more PowerStore arrays, uncomment the following lines and provide the required values
88+
# - endpoint: "https://11.0.0.1/api/rest"
89+
# globalID: "unique"
90+
# username: "user"
91+
# password: "password"
92+
# skipCertificateValidation: true
93+
# blockProtocol: "FC"

‎samples/volumesnapshotclass/snapclass.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ apiVersion: snapshot.storage.k8s.io/v1
1818
kind: VolumeSnapshotClass
1919
metadata:
2020
name: powerstore-snapshot
21-
driver: "csi-powerstore.dellemc.com" #driver name from values.yaml
21+
driver: "csi-powerstore.dellemc.com" # driver name from values.yaml
2222
deletionPolicy: Delete

‎tests/e2e/driver/resources/sc.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ kind: StorageClass
1515
metadata:
1616
name: powerstore-metro
1717
parameters:
18-
arrayID: "unique" # PowerStore Global ID
18+
arrayID: "unique" # PowerStore Global ID
1919
replication.storage.dell.com/isReplicationEnabled: "true"
2020
replication.storage.dell.com/mode: METRO
21-
replication.storage.dell.com/remoteSystem: "system-ID" # Remote PowerStore system name
21+
replication.storage.dell.com/remoteSystem: "system-ID" # Remote PowerStore system name
2222
provisioner: csi-powerstore.dellemc.com
2323
reclaimPolicy: Delete
2424
volumeBindingMode: Immediate

‎tests/e2e/k8s/e2e-values.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ execCommand: "while true ; do sleep 2 ; done"
2626

2727
# config for externalAccess e2e test suite
2828
externalAccess:
29-
endPoint: "https://10.0.0.1/api/rest" # array's endpoint
29+
endPoint: "https://10.0.0.1/api/rest" # array's endpoint
3030
userName: "user"
3131
password: "password"
32-
externalAccessIP: "10.0.0.1/25" # IP configured in values.yaml file while installing the driver
32+
externalAccessIP: "10.0.0.1/25" # IP configured in values.yaml file while installing the driver
3333
NASServer: "nas-server"
34-
testStatefulset: true # if wanted to test ExternalAccess with Deployment as well as with Statefulset resource
34+
testStatefulset: true # if wanted to test ExternalAccess with Deployment as well as with Statefulset resource

‎tests/sanity/helm/secret.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
# kubectl create secret generic powerstore-config -n csi-powerstore --from-file=config=secret.yaml
2020
#
2121
arrays:
22-
# endpoint: full URL path to the PowerStore API
23-
# Allowed Values: https://*.*.*.*/api/rest or https://abc.com/api/rest
24-
# Default Value: None
22+
# endpoint: full URL path to the PowerStore API
23+
# Allowed Values: https://*.*.*.*/api/rest or https://abc.com/api/rest
24+
# Default Value: None
2525
- endpoint: "https://10.0.0.1/api/rest"
2626

2727
# globalID: unique id of the PowerStore array
@@ -84,10 +84,10 @@ arrays:
8484
# Default value: "0777"
8585
# nfsAcls: "0777"
8686

87-
# To add more PowerStore arrays, uncomment the following lines and provide the required values
88-
#- endpoint: "https://11.0.0.1/api/rest"
89-
# globalID: "unique"
90-
# username: "user"
91-
# password: "password"
92-
# skipCertificateValidation: true
93-
# blockProtocol: "FC"
87+
# To add more PowerStore arrays, uncomment the following lines and provide the required values
88+
# - endpoint: "https://11.0.0.1/api/rest"
89+
# globalID: "unique"
90+
# username: "user"
91+
# password: "password"
92+
# skipCertificateValidation: true
93+
# blockProtocol: "FC"

0 commit comments

Comments
 (0)