Skip to content

Commit 829d373

Browse files
authored
drop support for docker hub (kubernetes#2170)
1 parent cfacf8f commit 829d373

File tree

3 files changed

+7
-28
lines changed

3 files changed

+7
-28
lines changed

.github/workflows/release-cpo.yaml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,6 @@ jobs:
1313
- name: Checkout
1414
uses: actions/checkout@v3
1515

16-
-
17-
# Add support for more platforms with QEMU (optional)
18-
# https://github.com/docker/setup-qemu-action
19-
name: Set up QEMU
20-
uses: docker/setup-qemu-action@v2
21-
22-
- name: Set up Docker Buildx
23-
uses: docker/setup-buildx-action@v2
24-
25-
- name: Login to docker hub
26-
uses: docker/login-action@v2
27-
with:
28-
registry: docker.io
29-
username: ${{ secrets.DOCKER_USERNAME }}
30-
password: ${{ secrets.DOCKER_PASSWORD }}
31-
32-
- name: Get the version from ref
33-
id: get_version
34-
run: echo VERSION=${GITHUB_REF/refs\/tags\//} >> $GITHUB_OUTPUT
35-
36-
- name: build & publish images
37-
run: |
38-
make push-multiarch-images REGISTRY=docker.io/k8scloudprovider VERSION=${{ steps.get_version.outputs.VERSION }}
39-
4016
- name: Create Release
4117
id: create_release
4218
uses: actions/create-release@v1

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ GOFLAGS :=
3838
TAGS :=
3939
LDFLAGS := "-w -s -X 'k8s.io/component-base/version.gitVersion=$(VERSION)'"
4040
GOX_LDFLAGS := $(shell echo "$(LDFLAGS) -extldflags \"-static\"")
41-
REGISTRY ?= k8scloudprovider
41+
REGISTRY ?= registry.k8s.io/provider-os
4242
IMAGE_OS ?= linux
4343
IMAGE_NAMES ?= openstack-cloud-controller-manager \
4444
cinder-csi-plugin \

release-procedure.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,13 @@ $ git checkout -b release-X.Y upstream/release-X.Y
2020
3. Make tag and push to upstream repo.
2121

2222
```
23-
$ git tag -m "Release for cloud-provider-openstack to support Kubernetes release x" vX.Y.Z
23+
$ git tag vX.Y.Z
2424
$ git push upstream vX.Y.Z
2525
```
2626

27-
4. [Github Actions](https://github.com/kubernetes/cloud-provider-openstack/actions/workflows/release-cpo.yaml) will make the new docker images and make [new draft release](https://github.com/kubernetes/cloud-provider-openstack/releases) to repository.
27+
4. [Github Actions](https://github.com/kubernetes/cloud-provider-openstack/actions/workflows/release-cpo.yaml) will make [new draft release](https://github.com/kubernetes/cloud-provider-openstack/releases) to repository.
28+
Cloudbuild should build new images to gcr.io/k8s-staging-provider-os.
2829

29-
5. Make release notes and publish the release.
30+
5. Make PR https://github.com/kubernetes/k8s.io/blob/main/k8s.gcr.io/images/k8s-staging-provider-os/images.yaml to promote gcr.io images to registry.k8s.io.
31+
32+
6. Make release notes and publish the release after the new images are published.

0 commit comments

Comments
 (0)