From e4898d70dbaa7f1383a72c0e614c062c77ae904f Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Wed, 7 Oct 2026 00:26:29 +1100 Subject: [PATCH] Merge pull request #11 from benvin/docker-internal-images Publish images to artifactapi docker-internal Co-authored-by: unkin-agent Co-committed-by: unkin-agent --- .woodpecker/build.yaml | 10 ++++++---- .woodpecker/docker.yaml | 27 +++++++++------------------ config/samples/00-cluster.yaml | 2 +- config/samples/03-api.yaml | 2 +- internal/controller/helpers.go | 3 +-- internal/kea/consts.go | 2 +- 6 files changed, 19 insertions(+), 27 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index d9a5652..1dfc61b 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -3,7 +3,7 @@ when: steps: - name: build-operator - image: woodpeckerci/plugin-docker-buildx + image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/plugin-docker-buildx:latest backend_options: kubernetes: serviceAccountName: kea-operator-ci @@ -15,12 +15,13 @@ steps: memory: 2Gi cpu: "2" settings: - repo: git.unkin.net/unkin/kea-operator + registry: artifactapi.k8s.syd1.au.unkin.net + repo: artifactapi.k8s.syd1.au.unkin.net/docker-internal/kea-operator dockerfile: Dockerfile.operator dry_run: true - name: build-api - image: woodpeckerci/plugin-docker-buildx + image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/plugin-docker-buildx:latest backend_options: kubernetes: serviceAccountName: kea-operator-ci @@ -32,6 +33,7 @@ steps: memory: 2Gi cpu: "2" settings: - repo: git.unkin.net/unkin/kea-api + registry: artifactapi.k8s.syd1.au.unkin.net + repo: artifactapi.k8s.syd1.au.unkin.net/docker-internal/kea-api dockerfile: Dockerfile.api dry_run: true diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml index 32d8864..ece4569 100644 --- a/.woodpecker/docker.yaml +++ b/.woodpecker/docker.yaml @@ -4,7 +4,7 @@ when: steps: - name: publish-operator - image: woodpeckerci/plugin-docker-buildx + image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/plugin-docker-buildx:latest backend_options: kubernetes: serviceAccountName: kea-operator-ci @@ -16,18 +16,15 @@ steps: memory: 2Gi cpu: "2" settings: - registry: git.unkin.net - repo: git.unkin.net/unkin/kea-operator + registry: artifactapi.k8s.syd1.au.unkin.net + repo: artifactapi.k8s.syd1.au.unkin.net/docker-internal/kea-operator dockerfile: Dockerfile.operator - username: droneci - password: - from_secret: DRONECI_PASSWORD tags: - ${CI_COMMIT_TAG} - latest - name: publish-api - image: woodpeckerci/plugin-docker-buildx + image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/plugin-docker-buildx:latest backend_options: kubernetes: serviceAccountName: kea-operator-ci @@ -39,18 +36,15 @@ steps: memory: 2Gi cpu: "2" settings: - registry: git.unkin.net - repo: git.unkin.net/unkin/kea-api + registry: artifactapi.k8s.syd1.au.unkin.net + repo: artifactapi.k8s.syd1.au.unkin.net/docker-internal/kea-api dockerfile: Dockerfile.api - username: droneci - password: - from_secret: DRONECI_PASSWORD tags: - ${CI_COMMIT_TAG} - latest - name: publish-kea - image: woodpeckerci/plugin-docker-buildx + image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/plugin-docker-buildx:latest backend_options: kubernetes: serviceAccountName: kea-operator-ci @@ -62,12 +56,9 @@ steps: memory: 2Gi cpu: "2" settings: - registry: git.unkin.net - repo: git.unkin.net/unkin/kea + registry: artifactapi.k8s.syd1.au.unkin.net + repo: artifactapi.k8s.syd1.au.unkin.net/docker-internal/kea dockerfile: Dockerfile.kea - username: droneci - password: - from_secret: DRONECI_PASSWORD tags: - ${CI_COMMIT_TAG} - latest diff --git a/config/samples/00-cluster.yaml b/config/samples/00-cluster.yaml index fc01e99..064f3fb 100644 --- a/config/samples/00-cluster.yaml +++ b/config/samples/00-cluster.yaml @@ -10,7 +10,7 @@ metadata: namespace: dhcp-system spec: replicas: 2 - image: git.unkin.net/unkin/kea:latest + image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/kea:latest domainName: main.unkin.net defaultLeaseTime: 1200 maxLeaseTime: 86400 diff --git a/config/samples/03-api.yaml b/config/samples/03-api.yaml index a0b1e04..9adcfa5 100644 --- a/config/samples/03-api.yaml +++ b/config/samples/03-api.yaml @@ -8,7 +8,7 @@ metadata: namespace: dhcp-system spec: replicas: 1 - image: git.unkin.net/unkin/kea-api:latest + image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/kea-api:latest service: type: ClusterIP port: 8080 diff --git a/internal/controller/helpers.go b/internal/controller/helpers.go index 6fb6f0a..92bcac3 100644 --- a/internal/controller/helpers.go +++ b/internal/controller/helpers.go @@ -35,8 +35,7 @@ const ( finalizer = "kea.unkin.net/finalizer" - defaultOperatorImage = "git.unkin.net/unkin/kea-operator:latest" - defaultAPIImage = "git.unkin.net/unkin/kea-api:latest" + defaultAPIImage = "artifactapi.k8s.syd1.au.unkin.net/docker-internal/kea-api:latest" ) func headlessName(cluster string) string { return cluster + "-headless" } diff --git a/internal/kea/consts.go b/internal/kea/consts.go index 4ad67d0..c6d675e 100644 --- a/internal/kea/consts.go +++ b/internal/kea/consts.go @@ -47,7 +47,7 @@ const ( DHCP4Port = 67 // DefaultImage is the kea workload image built by this repo. - DefaultImage = "git.unkin.net/unkin/kea:latest" + DefaultImage = "artifactapi.k8s.syd1.au.unkin.net/docker-internal/kea:latest" // ClientArchOption is the DHCP option code carrying PXE client arch. ClientArchOption = 93