Skip to content

Commit 99e1884

Browse files
YashwantGohokarYashwantGohokar
committed
Manifest and Dockerfile changes
1 parent 690231b commit 99e1884

File tree

57 files changed

+3834
-149
lines changed

Some content is hidden

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

57 files changed

+3834
-149
lines changed

‎Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,17 @@ FROM oraclelinux:8-slim
3232
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/
3333
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/image/* /usr/local/bin/
3434

35-
RUN yum install -y util-linux \
36-
&& yum install -y e2fsprogs \
37-
&& yum install -y xfsprogs \
38-
&& yum clean all
35+
RUN microdnf -y install util-linux e2fsprogs xfsprogs python2 && \
36+
microdnf update && \
37+
microdnf clean all
3938

4039
COPY scripts/encrypt-mount /sbin/encrypt-mount
4140
COPY scripts/encrypt-umount /sbin/encrypt-umount
4241
COPY scripts/rpm-host /sbin/rpm-host
4342
COPY scripts/chroot-bash /sbin/chroot-bash
44-
4543
RUN chmod 755 /sbin/encrypt-mount
4644
RUN chmod 755 /sbin/encrypt-umount
4745
RUN chmod 755 /sbin/rpm-host
4846
RUN chmod 755 /sbin/chroot-bash
4947

50-
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/
48+
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/

‎Dockerfile_arm_all

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG CI_IMAGE_REGISTRY
22

3-
FROM golang:1.20.4 as builder
3+
FROM golang:1.21.5 as builder
44

55
ARG COMPONENT
66

@@ -14,12 +14,11 @@ WORKDIR $SRC
1414

1515
RUN ARCH=arm make clean build-arm-all
1616

17-
FROM arm64v8/oraclelinux:7-slim
17+
FROM arm64v8/oraclelinux:8-slim
1818

19-
RUN yum install -y util-linux \
20-
&& yum install -y e2fsprogs \
21-
&& yum clean all
22-
\
19+
RUN microdnf -y install util-linux e2fsprogs xfsprogs python2 && \
20+
microdnf update && \
21+
microdnf clean all
2322

2423
COPY scripts/encrypt-mount /sbin/encrypt-mount
2524
COPY scripts/encrypt-umount /sbin/encrypt-umount
@@ -30,4 +29,4 @@ RUN chmod 755 /sbin/encrypt-umount
3029
RUN chmod 755 /sbin/rpm-host
3130
RUN chmod 755 /sbin/chroot-bash
3231

33-
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/arm/* /usr/local/bin/
32+
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/arm/* /usr/local/bin/

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ else
3838
VERSION ?= ${VERSION}
3939
endif
4040

41-
RELEASE = v1.28.0
41+
RELEASE = v1.29.0
4242

4343
GOOS ?= linux
4444
ARCH ?= amd64

‎hack/run_e2e_test.sh

Lines changed: 48 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,26 +43,54 @@ function set_image_pull_repo_and_delete_namespace_flag () {
4343
}
4444

4545
function run_e2e_tests_existing_cluster() {
46-
ginkgo -v -progress --trace "${FOCUS_OPT}" "${FOCUS_FP_OPT}" \
47-
test/e2e/cloud-provider-oci -- \
48-
--cluster-kubeconfig=${CLUSTER_KUBECONFIG} \
49-
--cloud-config=${CLOUD_CONFIG} \
50-
--adlocation=${ADLOCATION} \
51-
--delete-namespace=${DELETE_NAMESPACE} \
52-
--image-pull-repo=${IMAGE_PULL_REPO} \
53-
--cmek-kms-key=${CMEK_KMS_KEY} \
54-
--mnt-target-id=${MNT_TARGET_ID} \
55-
--mnt-target-subnet-id=${MNT_TARGET_SUBNET_ID} \
56-
--mnt-target-compartment-id=${MNT_TARGET_COMPARTMENT_ID} \
57-
--nsg-ocids=${NSG_OCIDS} \
58-
--backend-nsg-ocids=${BACKEND_NSG_OCIDS} \
59-
--reserved-ip=${RESERVED_IP} \
60-
--architecture=${ARCHITECTURE} \
61-
--volume-handle=${FSS_VOLUME_HANDLE} \
62-
--static-snapshot-compartment-id=${STATIC_SNAPSHOT_COMPARTMENT_ID} \
63-
--enable-parallel-run=${ENABLE_PARALLEL_RUN} \
64-
--run-uhp-e2e=${RUN_UHP_E2E} \
65-
--add-oke-system-tags="false"
46+
if [[ -z "${E2E_NODE_COUNT}" ]]; then
47+
E2E_NODE_COUNT=1
48+
fi
49+
50+
if [ "$ENABLE_PARALLEL_RUN" == "true" ] || [ "$ENABLE_PARALLEL_RUN" == "TRUE" ]; then
51+
ginkgo -v -p -progress --trace "${FOCUS_OPT}" "${FOCUS_FP_OPT}" \
52+
test/e2e/cloud-provider-oci -- \
53+
--cluster-kubeconfig=${CLUSTER_KUBECONFIG} \
54+
--cloud-config=${CLOUD_CONFIG} \
55+
--adlocation=${ADLOCATION} \
56+
--delete-namespace=${DELETE_NAMESPACE} \
57+
--image-pull-repo=${IMAGE_PULL_REPO} \
58+
--cmek-kms-key=${CMEK_KMS_KEY} \
59+
--mnt-target-id=${MNT_TARGET_ID} \
60+
--mnt-target-subnet-id=${MNT_TARGET_SUBNET_ID} \
61+
--mnt-target-compartment-id=${MNT_TARGET_COMPARTMENT_ID} \
62+
--nsg-ocids=${NSG_OCIDS} \
63+
--backend-nsg-ocids=${BACKEND_NSG_OCIDS} \
64+
--reserved-ip=${RESERVED_IP} \
65+
--architecture=${ARCHITECTURE} \
66+
--volume-handle=${FSS_VOLUME_HANDLE} \
67+
--static-snapshot-compartment-id=${STATIC_SNAPSHOT_COMPARTMENT_ID} \
68+
--enable-parallel-run=${ENABLE_PARALLEL_RUN} \
69+
--run-uhp-e2e=${RUN_UHP_E2E} \
70+
--add-oke-system-tags="false"
71+
else
72+
ginkgo -v -progress --trace -nodes=${E2E_NODE_COUNT} "${FOCUS_OPT}" "${FOCUS_FP_OPT}" \
73+
ginkgo -v -p -progress --trace "${FOCUS_OPT}" "${FOCUS_FP_OPT}" \
74+
test/e2e/cloud-provider-oci -- \
75+
--cluster-kubeconfig=${CLUSTER_KUBECONFIG} \
76+
--cloud-config=${CLOUD_CONFIG} \
77+
--adlocation=${ADLOCATION} \
78+
--delete-namespace=${DELETE_NAMESPACE} \
79+
--image-pull-repo=${IMAGE_PULL_REPO} \
80+
--cmek-kms-key=${CMEK_KMS_KEY} \
81+
--mnt-target-id=${MNT_TARGET_ID} \
82+
--mnt-target-subnet-id=${MNT_TARGET_SUBNET_ID} \
83+
--mnt-target-compartment-id=${MNT_TARGET_COMPARTMENT_ID} \
84+
--nsg-ocids=${NSG_OCIDS} \
85+
--backend-nsg-ocids=${BACKEND_NSG_OCIDS} \
86+
--reserved-ip=${RESERVED_IP} \
87+
--architecture=${ARCHITECTURE} \
88+
--volume-handle=${FSS_VOLUME_HANDLE} \
89+
--static-snapshot-compartment-id=${STATIC_SNAPSHOT_COMPARTMENT_ID} \
90+
--enable-parallel-run=${ENABLE_PARALLEL_RUN} \
91+
--run-uhp-e2e=${RUN_UHP_E2E} \
92+
--add-oke-system-tags="false"
93+
fi
6694
retval=$?
6795
return $retval
6896
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
path: /etc/kubernetes
4343
containers:
4444
- name: oci-cloud-controller-manager
45-
image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
45+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.29.0
4646
command: ["/usr/local/bin/oci-cloud-controller-manager"]
4747
args:
4848
- --cloud-config=/etc/oci/cloud-provider.yaml

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
node-role.kubernetes.io/control-plane: ""
2323
containers:
2424
- name: csi-volume-provisioner
25-
image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
25+
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
2626
args:
2727
- --csi-address=/var/run/shared-tmpfs/csi.sock
2828
- --volume-name-prefix=csi
@@ -37,7 +37,7 @@ spec:
3737
- mountPath: /var/run/shared-tmpfs
3838
name: shared-tmpfs
3939
- name: csi-fss-volume-provisioner
40-
image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
40+
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
4141
args:
4242
- --csi-address=/var/run/shared-tmpfs/csi-fss.sock
4343
- --volume-name-prefix=csi-fss
@@ -52,7 +52,7 @@ spec:
5252
- mountPath: /var/run/shared-tmpfs
5353
name: shared-tmpfs
5454
- name: csi-attacher
55-
image: registry.k8s.io/sig-storage/csi-attacher:v4.4.0
55+
image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1
5656
args:
5757
- --csi-address=/var/run/shared-tmpfs/csi.sock
5858
- --timeout=120s
@@ -65,7 +65,7 @@ spec:
6565
- mountPath: /var/run/shared-tmpfs
6666
name: shared-tmpfs
6767
- name: csi-resizer
68-
image: registry.k8s.io/sig-storage/csi-resizer:v1.9.0
68+
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1
6969
args:
7070
- --csi-address=/var/run/shared-tmpfs/csi.sock
7171
- --leader-election
@@ -96,7 +96,7 @@ spec:
9696
- --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
9797
command:
9898
- /usr/local/bin/oci-csi-controller-driver
99-
image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
99+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.29.0
100100
imagePullPolicy: IfNotPresent
101101
volumeMounts:
102102
- name: config

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ spec:
117117
fieldPath: spec.nodeName
118118
- name: PATH
119119
value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
120-
image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
120+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.29.0
121121
securityContext:
122122
privileged: true
123123
volumeMounts:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
secretName: oci-flexvolume-driver
4141
containers:
4242
- name: oci-flexvolume-driver
43-
image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
43+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.29.0
4444
command: ["/usr/local/bin/install.py", "-c", "/tmp/config.yaml"]
4545
securityContext:
4646
privileged: true
@@ -76,7 +76,7 @@ spec:
7676
type: DirectoryOrCreate
7777
containers:
7878
- name: oci-flexvolume-driver
79-
image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
79+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.29.0
8080
command: ["/usr/local/bin/install.py"]
8181
securityContext:
8282
privileged: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
secretName: oci-volume-provisioner
3636
containers:
3737
- name: oci-volume-provisioner
38-
image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
38+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.29.0
3939
command: ["/usr/local/bin/oci-volume-provisioner"]
4040
env:
4141
- name: NODE_NAME

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
secretName: oci-volume-provisioner
3636
containers:
3737
- name: oci-volume-provisioner
38-
image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
38+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.29.0
3939
command: ["/usr/local/bin/oci-volume-provisioner"]
4040
env:
4141
- name: NODE_NAME

‎pkg/cloudprovider/providers/oci/load_balancer.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,7 @@ func (cp *CloudProvider) EnsureLoadBalancer(ctx context.Context, clusterName str
539539
dimensionsMap[metrics.ComponentDimension] = lbMetricDimension
540540
dimensionsMap[metrics.ResourceOCIDDimension] = lbName
541541
metrics.SendMetricData(cp.metricPusher, getMetric(loadBalancerType, Update), time.Since(startTime).Seconds(), dimensionsMap)
542+
return nil, err
542543
}
543544
lbExists := !client.IsNotFound(err)
544545
lbOCID := ""

0 commit comments

Comments
 (0)