Skip to content

Commit 33fca73

Browse files
authored
switch release/api generator images to ghcr (#11528) (#11530)
Also update the go version in api generator image to 1.23 The previous version used 1.20.5, in this version the go generate command would fail on the current go mod (using 1.22), because it expects the go version to be in the format "x.y" insted of "x.y.z", in 1.23 this is no longer an issue. Signed-off-by: Humair Khan <[email protected]>
1 parent f26c1ae commit 33fca73

File tree

11 files changed

+19
-17
lines changed

11 files changed

+19
-17
lines changed

Diff for: api/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# Contact one of Bobgy, capri-xiyue or zijianjoy if this remote image needs an update.
16-
PREBUILT_REMOTE_IMAGE=gcr.io/ml-pipeline-test/api-generator:latest
15+
# Contact one of chensun, HumairAK, zijianjoy if this remote image needs an update.
16+
PREBUILT_REMOTE_IMAGE=ghcr.io/kubeflow/kfp-api-generator:1.0
1717

1818
.PHONY: all
1919
all: golang python

Diff for: backend/api/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Generate client code (go & json) from API protocol buffers
16-
FROM golang:1.22 as generator
16+
FROM golang:1.23 as generator
1717
ENV GRPC_GATEWAY_VERSION v1.9.6
1818
ENV GO_SWAGGER_VERSION v0.18.0
1919
ENV GOLANG_PROTOBUF_VERSION v1.5.1

Diff for: backend/api/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
IMAGE_TAG=kfp-api-generator
1818
# Contact chensun or zijianjoy if this remote image needs an update.
19-
REMOTE_IMAGE=gcr.io/ml-pipeline-test/api-generator
20-
# Image generated by https://github.com/kubeflow/pipelines/pull/10580
19+
REMOTE_IMAGE=ghcr.io/kubeflow/kfp-api-generator
20+
2121
# Keep in sync with the version used in test/release/Dockerfile.release
22-
PREBUILT_REMOTE_IMAGE=gcr.io/ml-pipeline-test/api-generator@sha256:41fd3e60ba40430a4c3d87e03be817c5f63b2dfed23059ec9d6bca62ce0cc39c
22+
PREBUILT_REMOTE_IMAGE=ghcr.io/kubeflow/kfp-api-generator:1.0
2323

2424
CONTAINER_ENGINE ?= docker
2525

Diff for: backend/api/README.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ API definitions in this folder are used to generate [`v1beta1`](https://www.kube
8181

8282
API generator image is defined in [Dockerfile](`./Dockerfile`). If you need to update the container, follow these steps:
8383

84-
1. Update the [Dockerfile](`./Dockerfile`) and build the image by running `docker build -t gcr.io/ml-pipeline-test/api-generator:latest .`
85-
1. Push the new container by running `docker push gcr.io/ml-pipeline-test/api-generator:latest` (requires to be [authenticated](https://cloud.google.com/container-registry/docs/advanced-authentication)).
84+
1. Login to GHCR container registry: `echo "<PAT>" | docker login ghcr.io -u <USERNAME> --password-stdin`
85+
* Replace `<PAT>` with a GitHub Personal Access Token (PAT) with the write:packages and `read:packages` scopes, as well as `delete:packages` if needed.
86+
1. Update the [Dockerfile](`./Dockerfile`) and build the image by running `docker build -t ghcr.io/kubeflow/kfp-api-generator:$VERSION .`
87+
1. Push the new container by running `docker push ghcr.io/kubeflow/kfp-api-generator:$VERSION` (requires to be [authenticated](https://cloud.google.com/container-registry/docs/advanced-authentication)).
8688
1. Update the `PREBUILT_REMOTE_IMAGE` variable in the [Makefile](./Makefile) to point to your new image.
87-
1. Similarly, push a new version of the release tools image to `gcr.io/ml-pipeline-test/release:latest` and run `make push` in [test/release/Makefile](../../test/release/Makefile).
89+
1. Similarly, push a new version of the release tools image to `ghcr.io/kubeflow/kfp-release:$VERSION` and run `make push` in [test/release/Makefile](../../test/release/Makefile).

Diff for: backend/src/v2/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ it should have the following content:
3333
For example:
3434

3535
```makefile
36-
export DEV_IMAGE_PREFIX=gcr.io/ml-pipeline-test/kfp-
36+
export DEV_IMAGE_PREFIX=ghcr.io/kubeflow-test/kfp-/kfp-
3737
```
3838

3939
Then after images are built, they will be pushed to locations like
40-
`gcr.io/ml-pipeline-test/kfp-driver`.
40+
`ghcr.io/kubeflow-test/kfp-driver`.
4141

4242
The `.env` file is ignored by git, it's your local development configuration.
4343

Diff for: kubernetes_platform/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
PREBUILT_REMOTE_IMAGE=gcr.io/ml-pipeline-test/api-generator:latest
15+
PREBUILT_REMOTE_IMAGE=ghcr.io/kubeflow/kfp-api-generator:1.0
1616

1717
.PHONY: all
1818
all: golang python

Diff for: test/release/Dockerfile.release

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

1515
# Based on KFP backend api client generator dockerfile
1616
# Keep in sync with the version used in backend/api/Makefile
17-
FROM gcr.io/ml-pipeline-test/api-generator@sha256:41fd3e60ba40430a4c3d87e03be817c5f63b2dfed23059ec9d6bca62ce0cc39c
17+
FROM ghcr.io/kubeflow/kfp-api-generator:1.0
1818

1919
# install nvm & node 12
2020
# Reference: https://stackoverflow.com/a/28390848

Diff for: test/release/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
REMOTE=gcr.io/ml-pipeline-test/release@sha256:ed1a4dbe536e7e161ad0d846b5681aacc0e0e7f285985cb1808c5c8987bcfeb0
15+
REMOTE=ghcr.io/kubeflow/kfp-release:1.0
1616

1717
CONTAINER_ENGINE ?= docker
1818

Diff for: test/release/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The script `./release.sh` is a wrapper
3535

3636
The script `./bump-version-docker.sh`
3737

38-
1. Runs `./bump-version-in-place.sh` in gcr.io/ml-pipeline-test/release:latest image.
38+
1. Runs `./bump-version-in-place.sh` in ghcr.io/kubeflow/kfp-release:$VERSION image.
3939

4040
The script `./bump-version-in-place.sh` does the following:
4141

Diff for: test/release/bump-version-docker.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if [[ -z "$TAG_NAME" ]]; then
3131
fi
3232

3333
pushd "${REPO_ROOT}"
34-
RELEASE_IMAGE=${RELEASE_IMAGE:-gcr.io/ml-pipeline-test/release@sha256:ed1a4dbe536e7e161ad0d846b5681aacc0e0e7f285985cb1808c5c8987bcfeb0}
34+
RELEASE_IMAGE=${RELEASE_IMAGE:-ghcr.io/kubeflow/kfp-release:1.0}
3535
docker run -it --rm \
3636
--user $(id -u):$(id -g) \
3737
--mount type=bind,source="$(pwd)",target=/go/src/github.com/kubeflow/pipelines \

Diff for: test/release/release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ fi
5252
echo "Running the bump version script in cloned repo"
5353
echo -n "$TAG" > ./VERSION
5454

55-
PREBUILT_REMOTE_IMAGE=gcr.io/ml-pipeline-test/release@sha256:ed1a4dbe536e7e161ad0d846b5681aacc0e0e7f285985cb1808c5c8987bcfeb0
55+
PREBUILT_REMOTE_IMAGE=ghcr.io/kubeflow/kfp-release:1.0
5656
pushd ./test/release
5757
make release-in-place
5858
popd

0 commit comments

Comments
 (0)