Skip to content

Commit bc5becf

Browse files
committed
Remove references to registry.opensource.zalan.do
Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>
1 parent 2e098ed commit bc5becf

6 files changed

Lines changed: 102 additions & 15 deletions

File tree

.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,11 @@ updates:
2020
# Ignore k8s and its transitives modules as they are upgraded manually
2121
- dependency-name: "k8s.io/*"
2222
update-types: ["version-update:semver-major", "version-update:semver-minor"]
23+
- package-ecosystem: "github-actions"
24+
directory: "/"
25+
schedule:
26+
interval: "monthly"
27+
groups:
28+
github-actions:
29+
patterns:
30+
- "*"

.github/workflows/gh-packages.yaml

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
name: gh-package-deploy
2+
permissions: {}
3+
4+
on:
5+
push:
6+
branches:
7+
- master
8+
tags:
9+
- '*'
10+
11+
env:
12+
REGISTRY: ghcr.io
13+
IMAGE_NAME: "${{ github.repository }}"
14+
15+
jobs:
16+
docker:
17+
if: ${{ github.actor != 'dependabot[bot]' }}
18+
19+
runs-on: ubuntu-latest
20+
# Adding this block will overridw default values to None if not specified in the block
21+
# https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs
22+
permissions:
23+
contents: read
24+
actions: read
25+
packages: write # to push packages
26+
steps:
27+
- name: Checkout
28+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98
29+
30+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c
31+
with:
32+
# https://www.npmjs.com/package/semver#caret-ranges-123-025-004
33+
go-version: '^1.26'
34+
35+
- name: Login to Github Container Registry
36+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2
37+
with:
38+
registry: ${{ env.REGISTRY }}
39+
username: ${{ github.actor }}
40+
password: ${{ secrets.GITHUB_TOKEN }}
41+
42+
- uses: actions-ecosystem/action-get-latest-tag@b7c32daec3395a9616f88548363a42652b22d435
43+
id: get-latest-tag
44+
45+
- name: Build binaries
46+
run: |
47+
make build.linux.amd64 build.linux.arm64
48+
49+
- name: Set up QEMU
50+
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a
51+
52+
- name: Set up Docker Buildx
53+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
54+
55+
- name: Login to GitHub Container Registry
56+
if: github.event_name != 'pull_request'
57+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2
58+
with:
59+
registry: ghcr.io
60+
username: ${{ github.actor }}
61+
password: ${{ secrets.GITHUB_TOKEN }}
62+
63+
- name: Docker meta
64+
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf
65+
id: meta
66+
with:
67+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
68+
tags: |
69+
type=semver,pattern=v{{version}}
70+
type=semver,pattern=v{{major}}.{{minor}}
71+
72+
- name: Build and push
73+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294
74+
with:
75+
context: .
76+
platforms: linux/amd64,linux/arm64
77+
push: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/v') }}
78+
tags: ${{ steps.meta.outputs.tags }}
79+
labels: ${{ steps.meta.outputs.labels }}
80+
81+
# Build and push latest tag
82+
- name: Build and push latest
83+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294
84+
with:
85+
context: .
86+
platforms: linux/amd64,linux/arm64
87+
push: ${{ github.event_name != 'pull_request' }}
88+
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
89+
labels: ${{ steps.meta.outputs.labels }}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BASE_IMAGE=registry.opensource.zalan.do/library/static:latest
1+
ARG BASE_IMAGE=gcr.io/distroless/static-debian12:latest
22
FROM ${BASE_IMAGE}
33
LABEL maintainer="Team Teapot @ Zalando SE <team-teapot@zalando.de>"
44

Dockerfile.e2e

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BASE_IMAGE=registry.opensource.zalan.do/library/static:latest
1+
ARG BASE_IMAGE=gcr.io/distroless/static-debian12:latest
22
FROM ${BASE_IMAGE}
33
LABEL maintainer="Team Teapot @ Zalando SE <team-teapot@zalando.de>"
44

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ BINARIES = $(BINARY) traffic
55
LOCAL_BINARIES = $(addprefix build/,$(BINARIES))
66
LINUX_BINARIES = $(addprefix build/linux/,$(BINARIES))
77
VERSION ?= $(shell git describe --tags --always --dirty)
8-
IMAGE ?= registry-write.opensource.zalan.do/teapot/$(BINARY)
8+
IMAGE ?= ghrc.io/zalando-incubator/$(BINARY)
99
E2E_IMAGE ?= $(IMAGE)-e2e
1010
TAG ?= $(VERSION)
1111
SOURCES = $(shell find . -name '*.go')

delivery.yaml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ pipeline:
2222
fi
2323
make check
2424
make test
25-
- desc: build
26-
cmd: |
27-
make build.docker
28-
- desc: push
29-
cmd: |
30-
IMAGE=registry-write.opensource.zalan.do/teapot/stackset-controller-test
31-
IMAGE=$IMAGE VERSION=$CDP_BUILD_VERSION make build.push
3225
- desc: Build and push image to Zalando's registry
3326
cmd: |
3427
IMAGE=container-registry-test.zalando.net/teapot/stackset-controller
@@ -108,10 +101,7 @@ pipeline:
108101
echo "Creating release for tag: ${VERSION}"
109102
git gh-tag $VERSION
110103
echo "create and push docker container"
111-
IMAGE=registry-write.opensource.zalan.do/teapot/stackset-controller
112-
IMAGE=$IMAGE VERSION=$VERSION make build.docker
113104
git diff --stat --exit-code
114-
IMAGE=$IMAGE VERSION=$VERSION make build.push
115105
116106
# Build and push image to Zalando's registry
117107
IMAGE=container-registry-test.zalando.net/teapot/stackset-controller
@@ -126,9 +116,9 @@ pipeline:
126116
echo -e "### Changes\n" >$tf
127117
git log -1 --pretty=%B | grep -v 'Signed-off-by:' | grep -v -E '^\s*$' | grep -vE '^\*' >>$tf
128118
echo -e "\n### Docker image\n" >>$tf
129-
echo -e "Docker image is available in Zalando's Open Source registry:\n" >>$tf
119+
echo -e "Docker image is available in Github Container Registry:\n" >>$tf
130120
echo -e '```' >>$tf
131-
echo -e "docker run -it registry.opensource.zalan.do/teapot/stackset-controller:${VERSION} --help" >>$tf
121+
echo -e "docker run -it ghrc.io/zalando-incubator/stackset-controller:${VERSION} --help" >>$tf
132122
echo -e '```' >>$tf
133123
echo "################################"
134124
cat $tf

0 commit comments

Comments
 (0)