Skip to content

Commit 122e470

Browse files
Updated Dockerfile, Manifests, Readme and third party licenses
1 parent 690231b commit 122e470

File tree

61 files changed

+4245
-204
lines changed

Some content is hidden

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

61 files changed

+4245
-204
lines changed

Diff for: .github/workflows/release.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${GITHUB_ACTOR,,} --password-stdin
2727

2828
- name: Build Image
29-
run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make image
29+
run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make image
3030

3131
- name: Push Image
32-
run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make docker-push-all
32+
run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make docker-push-all

Diff for: Dockerfile

+4-6
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/

Diff for: Dockerfile_arm_all

+6-7
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/

Diff for: Makefile

+1-1
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

Diff for: README.md

+5-10
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,15 @@ cloud-provider specific code out of the Kubernetes codebase.
3131
| v1.23.0 | v1.23 | - |
3232
| v1.24.2 | v1.24 | - |
3333
| v1.25.2 | v1.25 | - |
34-
| v1.26.3 | v1.26 | - |
35-
| v1.27.2 | v1.27 | - |
36-
| v1.28.0 | v1.28 | - |
34+
| v1.26.4 | v1.26 | - |
35+
| v1.27.3 | v1.27 | - |
36+
| v1.28.1 | v1.28 | - |
37+
| v1.29.0 | v1.29 | - |
3738

3839

3940

4041
Note:
41-
Versions older than v1.26.3 are no longer supported, new features / bug fixes will be available in v1.26.3 and later.
42+
Versions older than v1.27.3 are no longer supported, new features / bug fixes will be available in v1.27.3 and later.
4243

4344
## Implementation
4445
Currently `oci-cloud-controller-manager` implements:
@@ -170,12 +171,6 @@ This project welcomes contributions from the community. Before submitting a pull
170171

171172
Please consult the [security guide](./SECURITY.md) for our responsible security vulnerability disclosure process
172173

173-
## Upcoming Releases
174-
175-
| Release | Expected Release Date |
176-
|-----------------------|-----------------------|
177-
| Support for K8s v1.24 | August 2022 |
178-
179174
## License
180175

181176
Copyright (c) 2017, 2023 Oracle and/or its affiliates. All rights reserved.

0 commit comments

Comments
 (0)