From 999560be8913ef3758b9d219e65ab2bfe1b70300 Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Boll Date: Tue, 15 Oct 2024 10:06:48 +0200 Subject: [PATCH] Change Container builds Add the configuration to this repo and reference it in the Dockerfile, thus add it to the image --- image-sync/configuration/mvp-image-sync.yml | 9 +++++++ image-sync/configuration/mvp-oc-mirror.yml | 30 +++++++++++++++++++++ image-sync/oc-mirror/Dockerfile | 2 ++ image-sync/oc-mirror/Makefile | 1 + image-sync/oc-mirror/config.yml | 30 +++++++++++++++++++++ tooling/image-sync/Dockerfile | 3 ++- tooling/image-sync/Makefile | 1 + tooling/image-sync/config.yml | 9 +++++++ 8 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 image-sync/configuration/mvp-image-sync.yml create mode 100644 image-sync/configuration/mvp-oc-mirror.yml create mode 100644 image-sync/oc-mirror/config.yml create mode 100644 tooling/image-sync/config.yml diff --git a/image-sync/configuration/mvp-image-sync.yml b/image-sync/configuration/mvp-image-sync.yml new file mode 100644 index 000000000..3dd45c233 --- /dev/null +++ b/image-sync/configuration/mvp-image-sync.yml @@ -0,0 +1,9 @@ +repositories: + - registry.k8s.io/external-dns/external-dns + - quay.io/acm-d/rhtap-hypershift-operator + - quay.io/pstefans/controlplaneoperator + - quay.io/app-sre/uhc-clusters-service +numberOfTags: 10 +quaySecretfile: /etc/containers/quayio-auth.json +acrRegistry: arohcpdev.azurecr.io +tenantId: 64dc69e4-d083-49fc-9569-ebece1dd1408 diff --git a/image-sync/configuration/mvp-oc-mirror.yml b/image-sync/configuration/mvp-oc-mirror.yml new file mode 100644 index 000000000..483d847ce --- /dev/null +++ b/image-sync/configuration/mvp-oc-mirror.yml @@ -0,0 +1,30 @@ +kind: ImageSetConfiguration +apiVersion: mirror.openshift.io/v1alpha2 +storageConfig: + registry: + imageURL: arohcpdev.azurecr.io/mirror/oc-mirror-metadata + skipTLS: false +mirror: + platform: + architectures: + - multi + - amd64 + channels: + - name: stable-4.16 + minVersion: 4.16.0 + maxVersion: 4.16.3 + type: ocp + - name: stable-4.17 + minVersion: 4.17.0 + maxVersion: 4.17.0 + type: ocp + graph: true + additionalImages: + - name: registry.redhat.io/redhat/redhat-operator-index:v4.16 + - name: registry.redhat.io/redhat/certified-operator-index:v4.16 + - name: registry.redhat.io/redhat/community-operator-index:v4.16 + - name: registry.redhat.io/redhat/redhat-marketplace-index:v4.16 + - name: registry.redhat.io/redhat/redhat-operator-index:v4.17 + - name: registry.redhat.io/redhat/certified-operator-index:v4.17 + - name: registry.redhat.io/redhat/community-operator-index:v4.17 + - name: registry.redhat.io/redhat/redhat-marketplace-index:v4.17 \ No newline at end of file diff --git a/image-sync/oc-mirror/Dockerfile b/image-sync/oc-mirror/Dockerfile index 4859eef40..f307dda62 100644 --- a/image-sync/oc-mirror/Dockerfile +++ b/image-sync/oc-mirror/Dockerfile @@ -31,3 +31,5 @@ COPY --chown=0:0 --chmod=755 --from=downloader \ /usr/local/bin/oc \ /usr/local/bin/kubectl \ /usr/local/bin/ + +ENTRYPOINT ["oc-mirror", "--continue-on-error", "--config", "/etc/oc-mirror/imageset-config.yml"] diff --git a/image-sync/oc-mirror/Makefile b/image-sync/oc-mirror/Makefile index 08e80618c..e62cfc6db 100644 --- a/image-sync/oc-mirror/Makefile +++ b/image-sync/oc-mirror/Makefile @@ -9,6 +9,7 @@ OC_MIRROR_IMAGE_TAGGED ?= $(OC_MIRROR_IMAGE):$(COMMIT) build-push: image push image: + cp ../configuration/mvp-oc-mirror.yml config.yml docker build --platform="linux/amd64" -f "./Dockerfile" -t ${OC_MIRROR_IMAGE_TAGGED} . push: image diff --git a/image-sync/oc-mirror/config.yml b/image-sync/oc-mirror/config.yml new file mode 100644 index 000000000..483d847ce --- /dev/null +++ b/image-sync/oc-mirror/config.yml @@ -0,0 +1,30 @@ +kind: ImageSetConfiguration +apiVersion: mirror.openshift.io/v1alpha2 +storageConfig: + registry: + imageURL: arohcpdev.azurecr.io/mirror/oc-mirror-metadata + skipTLS: false +mirror: + platform: + architectures: + - multi + - amd64 + channels: + - name: stable-4.16 + minVersion: 4.16.0 + maxVersion: 4.16.3 + type: ocp + - name: stable-4.17 + minVersion: 4.17.0 + maxVersion: 4.17.0 + type: ocp + graph: true + additionalImages: + - name: registry.redhat.io/redhat/redhat-operator-index:v4.16 + - name: registry.redhat.io/redhat/certified-operator-index:v4.16 + - name: registry.redhat.io/redhat/community-operator-index:v4.16 + - name: registry.redhat.io/redhat/redhat-marketplace-index:v4.16 + - name: registry.redhat.io/redhat/redhat-operator-index:v4.17 + - name: registry.redhat.io/redhat/certified-operator-index:v4.17 + - name: registry.redhat.io/redhat/community-operator-index:v4.17 + - name: registry.redhat.io/redhat/redhat-marketplace-index:v4.17 \ No newline at end of file diff --git a/tooling/image-sync/Dockerfile b/tooling/image-sync/Dockerfile index 7ff6cc491..94b60e058 100644 --- a/tooling/image-sync/Dockerfile +++ b/tooling/image-sync/Dockerfile @@ -8,5 +8,6 @@ RUN CGO_ENABLED=1 go build -tags=containers_image_openpgp,requirefips . FROM --platform=${TARGETPLATFORM:-linux/amd64} mcr.microsoft.com/cbl-mariner/distroless/base:2.0-nonroot@sha256:ef0dc582fc2a8dd34fbb41341a3a9a1aaa70d4542ff04ce4e33a641e52e4807e WORKDIR / +ADD config.yml /app/config.yml COPY --from=builder /app/image-sync . -ENTRYPOINT ["/image-sync"] \ No newline at end of file +CMD ["/image-sync", "-c", "/app/config.yml"] \ No newline at end of file diff --git a/tooling/image-sync/Makefile b/tooling/image-sync/Makefile index 348db37ed..ee5c42683 100644 --- a/tooling/image-sync/Makefile +++ b/tooling/image-sync/Makefile @@ -17,6 +17,7 @@ clean: build-push: image push image: + cp ../../image-sync/configuration/mvp-image-sync.yml config.yml docker build --platform="linux/amd64" -f "./Dockerfile" -t ${ARO_HCP_IMAGE_SYNC_IMAGE}:${COMMIT} . push: diff --git a/tooling/image-sync/config.yml b/tooling/image-sync/config.yml new file mode 100644 index 000000000..3dd45c233 --- /dev/null +++ b/tooling/image-sync/config.yml @@ -0,0 +1,9 @@ +repositories: + - registry.k8s.io/external-dns/external-dns + - quay.io/acm-d/rhtap-hypershift-operator + - quay.io/pstefans/controlplaneoperator + - quay.io/app-sre/uhc-clusters-service +numberOfTags: 10 +quaySecretfile: /etc/containers/quayio-auth.json +acrRegistry: arohcpdev.azurecr.io +tenantId: 64dc69e4-d083-49fc-9569-ebece1dd1408