Skip to content

Commit 1adedcb

Browse files
committed
CI and Manifest changes for v1.23
1 parent 1a64080 commit 1adedcb

File tree

10 files changed

+14
-20
lines changed

10 files changed

+14
-20
lines changed

.github/workflows/makefile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Set up Go 1.x
1313
uses: actions/setup-go@v2
1414
with:
15-
go-version: 1.16
15+
go-version: 1.17
1616
id: go
1717

1818
- name: Check out code into the Go module directory

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
ARG CI_IMAGE_REGISTRY
1616

17-
FROM ${CI_IMAGE_REGISTRY}/oci-kube-ci:1.0.6
17+
FROM golang:1.17.3 as builder
1818

1919
ARG COMPONENT
2020

Dockerfile_arm_all

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG CI_IMAGE_REGISTRY
22

3-
FROM ${CI_IMAGE_REGISTRY}/oci-kube-ci:1.0.6 as builder
3+
FROM golang:1.17.3 as builder
44

55
ARG COMPONENT
66

Makefile

+2-8
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ else
3838
VERSION ?= ${VERSION}
3939
endif
4040

41-
RELEASE = v1.22.0
41+
RELEASE = v1.23.0
4242

4343
GOOS ?= linux
4444
ARCH ?= amd64
@@ -77,19 +77,13 @@ check: gofmt govet golint
7777
.PHONY: build-dirs
7878
build-dirs:
7979
@mkdir -p dist/
80-
@mkdir -p dist/arm/
8180

8281
.PHONY: build
8382
build: build-dirs
8483
@for component in $(COMPONENT); do \
85-
GOOS=$(GOOS) GOARCH=$(ARCH) CGO_ENABLED=1 go build -mod vendor -o dist/$$component -ldflags "-X main.version=$(VERSION) -X main.build=$(BUILD)" ./cmd/$$component ; \
84+
GOOS=$(GOOS) GOARCH=$(ARCH) CGO_ENABLED=0 go build -o dist/$$component -ldflags "-X main.version=$(VERSION) -X main.build=$(BUILD)" ./cmd/$$component ; \
8685
done
8786

88-
.PHONY: build-arm
89-
build-arm: build-dirs
90-
GOOS=$(GOOS) GOARCH=arm64 CGO_ENABLED=0 go build -mod vendor -o dist/arm/oci-csi-node-driver -ldflags "-X main.version=$(VERSION) -X main.build=$(BUILD)" ./cmd/oci-csi-node-driver ;
91-
GOOS=$(GOOS) GOARCH=arm64 CGO_ENABLED=0 go build -mod vendor -o dist/arm/oci-flexvolume-driver -ldflags "-X main.version=$(VERSION) -X main.build=$(BUILD)" ./cmd/oci-flexvolume-driver ; \
92-
9387
.PHONY: manifests
9488
manifests: build-dirs
9589
@mkdir -p ${RELEASE}

manifests/cloud-controller-manager/oci-cloud-controller-manager.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
path: /etc/kubernetes
4040
containers:
4141
- name: oci-cloud-controller-manager
42-
image: ghcr.io/oracle/cloud-provider-oci:v1.22.0
42+
image: ghcr.io/oracle/cloud-provider-oci:v1.23.0
4343
command: ["/usr/local/bin/oci-cloud-controller-manager"]
4444
args:
4545
- --cloud-config=/etc/oci/cloud-provider.yaml

manifests/container-storage-interface/oci-csi-controller-driver.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
node-role.kubernetes.io/master: ""
2323
containers:
2424
- name: csi-volume-provisioner
25-
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2
25+
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0
2626
args:
2727
- --csi-address=/var/run/shared-tmpfs/csi.sock
2828
- --volume-name-prefix=csi
@@ -50,7 +50,7 @@ spec:
5050
- mountPath: /var/run/shared-tmpfs
5151
name: shared-tmpfs
5252
- name: csi-resizer
53-
image: k8s.gcr.io/sig-storage/csi-resizer:v1.2.0
53+
image: k8s.gcr.io/sig-storage/csi-resizer:v1.4.0
5454
args:
5555
- --csi-address=/var/run/shared-tmpfs/csi.sock
5656
- --leader-election
@@ -63,7 +63,7 @@ spec:
6363
- --endpoint=unix://var/run/shared-tmpfs/csi.sock
6464
command:
6565
- /usr/local/bin/oci-csi-controller-driver
66-
image: ghcr.io/oracle/cloud-provider-oci:v1.22.0
66+
image: ghcr.io/oracle/cloud-provider-oci:v1.23.0
6767
imagePullPolicy: IfNotPresent
6868
volumeMounts:
6969
- name: config

manifests/container-storage-interface/oci-csi-node-driver.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ spec:
110110
fieldPath: spec.nodeName
111111
- name: PATH
112112
value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
113-
image: ghcr.io/oracle/cloud-provider-oci:v1.22.0
113+
image: ghcr.io/oracle/cloud-provider-oci:v1.23.0
114114
securityContext:
115115
privileged: true
116116
volumeMounts:

manifests/flexvolume-driver/oci-flexvolume-driver.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
secretName: oci-flexvolume-driver
3838
containers:
3939
- name: oci-flexvolume-driver
40-
image: ghcr.io/oracle/cloud-provider-oci:v1.22.0
40+
image: ghcr.io/oracle/cloud-provider-oci:v1.23.0
4141
command: ["/usr/local/bin/install.py", "-c", "/tmp/config.yaml"]
4242
securityContext:
4343
privileged: true
@@ -73,7 +73,7 @@ spec:
7373
type: DirectoryOrCreate
7474
containers:
7575
- name: oci-flexvolume-driver
76-
image: ghcr.io/oracle/cloud-provider-oci:v1.22.0
76+
image: ghcr.io/oracle/cloud-provider-oci:v1.23.0
7777
command: ["/usr/local/bin/install.py"]
7878
securityContext:
7979
privileged: true

manifests/volume-provisioner/oci-volume-provisioner-fss.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
secretName: oci-volume-provisioner
2323
containers:
2424
- name: oci-volume-provisioner
25-
image: ghcr.io/oracle/cloud-provider-oci:v1.22.0
25+
image: ghcr.io/oracle/cloud-provider-oci:v1.23.0
2626
command: ["/usr/local/bin/oci-volume-provisioner"]
2727
env:
2828
- name: NODE_NAME

manifests/volume-provisioner/oci-volume-provisioner.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
secretName: oci-volume-provisioner
2323
containers:
2424
- name: oci-volume-provisioner
25-
image: ghcr.io/oracle/cloud-provider-oci:v1.22.0
25+
image: ghcr.io/oracle/cloud-provider-oci:v1.23.0
2626
command: ["/usr/local/bin/oci-volume-provisioner"]
2727
env:
2828
- name: NODE_NAME

0 commit comments

Comments
 (0)