Skip to content

Commit

Permalink
Updated Dockerfile, Manifests, Readme and third party licenses
Browse files Browse the repository at this point in the history
  • Loading branch information
YashwantGohokar committed Jul 4, 2024
1 parent 52c8a67 commit 510beed
Show file tree
Hide file tree
Showing 61 changed files with 4,245 additions and 204 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${GITHUB_ACTOR,,} --password-stdin

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

- name: Push Image
run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make docker-push-all
run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make docker-push-all
10 changes: 4 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,17 @@ FROM oraclelinux:8-slim
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/image/* /usr/local/bin/

RUN yum install -y util-linux \
&& yum install -y e2fsprogs \
&& yum install -y xfsprogs \
&& yum clean all
RUN microdnf -y install util-linux e2fsprogs xfsprogs python2 && \
microdnf update && \
microdnf clean all

COPY scripts/encrypt-mount /sbin/encrypt-mount
COPY scripts/encrypt-umount /sbin/encrypt-umount
COPY scripts/rpm-host /sbin/rpm-host
COPY scripts/chroot-bash /sbin/chroot-bash

RUN chmod 755 /sbin/encrypt-mount
RUN chmod 755 /sbin/encrypt-umount
RUN chmod 755 /sbin/rpm-host
RUN chmod 755 /sbin/chroot-bash

COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/
13 changes: 6 additions & 7 deletions Dockerfile_arm_all
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG CI_IMAGE_REGISTRY

FROM golang:1.20.4 as builder
FROM golang:1.21.5 as builder

ARG COMPONENT

Expand All @@ -14,12 +14,11 @@ WORKDIR $SRC

RUN ARCH=arm make clean build-arm-all

FROM arm64v8/oraclelinux:7-slim
FROM arm64v8/oraclelinux:8-slim

RUN yum install -y util-linux \
&& yum install -y e2fsprogs \
&& yum clean all
\
RUN microdnf -y install util-linux e2fsprogs xfsprogs python2 && \
microdnf update && \
microdnf clean all

COPY scripts/encrypt-mount /sbin/encrypt-mount
COPY scripts/encrypt-umount /sbin/encrypt-umount
Expand All @@ -30,4 +29,4 @@ RUN chmod 755 /sbin/encrypt-umount
RUN chmod 755 /sbin/rpm-host
RUN chmod 755 /sbin/chroot-bash

COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/arm/* /usr/local/bin/
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/arm/* /usr/local/bin/
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ else
VERSION ?= ${VERSION}
endif

RELEASE = v1.28.0
RELEASE = v1.29.0

GOOS ?= linux
ARCH ?= amd64
Expand Down
15 changes: 5 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@ cloud-provider specific code out of the Kubernetes codebase.
| v1.23.0 | v1.23 | - |
| v1.24.2 | v1.24 | - |
| v1.25.2 | v1.25 | - |
| v1.26.3 | v1.26 | - |
| v1.27.2 | v1.27 | - |
| v1.28.0 | v1.28 | - |
| v1.26.4 | v1.26 | - |
| v1.27.3 | v1.27 | - |
| v1.28.1 | v1.28 | - |
| v1.29.0 | v1.29 | - |



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

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

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

## Upcoming Releases

| Release | Expected Release Date |
|-----------------------|-----------------------|
| Support for K8s v1.29 | July 2024 |

## License

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

0 comments on commit 510beed

Please sign in to comment.