diff --git a/clusters/k8s01/system-upgrades/dns.yaml b/clusters/k8s01/system-upgrades/dns.yaml index c85f6ef65984116770e91ae0959833cdf32d1750..bdaef0728e125722c2729c561fa0413806182250 100644 --- a/clusters/k8s01/system-upgrades/dns.yaml +++ b/clusters/k8s01/system-upgrades/dns.yaml @@ -88,7 +88,7 @@ spec: force: false version: 1.0.0 upgrade: - image: registry.fedoraproject.org/fedora:35 + image: quay.io/fedora/fedora:36 command: - chroot - /host diff --git a/images/demo/Dockerfile b/images/demo/Dockerfile index fc8df6a4578fe89aa3dc72dcfd1906eb5a10f98a..937d26591532ceed49264558fc7deddde1fec4eb 100644 --- a/images/demo/Dockerfile +++ b/images/demo/Dockerfile @@ -1,3 +1,3 @@ -FROM registry.fedoraproject.org/fedora:36 +FROM quay.io/fedora/fedora:36 RUN echo "Hello world" diff --git a/images/koolbox/Dockerfile b/images/koolbox/Dockerfile index 372ab16cc4f30033505a0743a33aa7038fde5d29..5ef1d41385e986f0e054c07110700da6a6a51f1d 100644 --- a/images/koolbox/Dockerfile +++ b/images/koolbox/Dockerfile @@ -1,5 +1,5 @@ # kubectl CLI cache -FROM registry.fedoraproject.org/fedora:36 as kubectl +FROM quay.io/fedora/fedora:36 as kubectl # renovate: datasource=github-releases depName=kubernetes/kubernetes ARG KUBECTL_VERSION=v1.25.3 @@ -24,7 +24,7 @@ FROM ghcr.io/caarlos0/svu:v1.9.0 as svu FROM quay.io/git-chglog/git-chglog:0.15.1 as git-chglog # Helm CLI cache -FROM registry.fedoraproject.org/fedora:36 as helm +FROM quay.io/fedora/fedora:36 as helm # renovate: datasource=github-releases depName=helm/helm ARG HELM_VERSION=v3.10.2 @@ -34,7 +34,7 @@ RUN curl -L "https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz" | tar && install -o root -g root -m 0755 helm /usr/local/bin/helm # Flux CLI cache -FROM registry.fedoraproject.org/fedora:36 as flux +FROM quay.io/fedora/fedora:36 as flux # renovate: datasource=github-releases depName=fluxcd/flux2 ARG FLUX_VERSION=v0.36.0 @@ -44,7 +44,7 @@ RUN curl -L https://github.com/fluxcd/flux2/releases/download/${FLUX_VERSION}/fl && install -o root -g root -m 0755 flux /usr/local/bin/flux # kustomize CLI cache -FROM registry.fedoraproject.org/fedora:36 as kustomize +FROM quay.io/fedora/fedora:36 as kustomize # renovate: datasource=github-releases depName=kubernetes-sigs/kustomize ARG KUSTOMIZE_VERSION=4.1.3 @@ -54,7 +54,7 @@ RUN curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/kusto && install -o root -g root -m 0755 kustomize /usr/local/bin/kustomize # kubeval CLI cache -FROM registry.fedoraproject.org/fedora:36 as kubeval +FROM quay.io/fedora/fedora:36 as kubeval # renovate: datasource=github-releases depName=instrumenta/kubeval ARG KUBEVAL_VERSION=v0.16.1 @@ -64,7 +64,7 @@ RUN curl -L https://github.com/instrumenta/kubeval/releases/download/${KUBEVAL_V && install -o root -g root -m 0755 kubeval /usr/local/bin/kubeval # SOPS CLI cache -FROM registry.fedoraproject.org/fedora:36 as sops +FROM quay.io/fedora/fedora:36 as sops # renovate: datasource=github-releases depName=mozilla/sops ARG SOPS_VERSION=v3.7.3 @@ -74,7 +74,7 @@ RUN curl -L https://github.com/mozilla/sops/releases/download/${SOPS_VERSION}/so && install -o root -g root -m 0755 sops /usr/local/bin/sops # logcli cache -FROM registry.fedoraproject.org/fedora:35 as logcli +FROM quay.io/fedora/fedora:36 as logcli # renovate: datasource=github-releases depName=grafana/loki ARG LOKI_VERSION=v2.6.1 @@ -84,7 +84,7 @@ RUN curl -L https://github.com/grafana/loki/releases/download/${LOKI_VERSION}/lo && install -o root -g root -m 0755 logcli /usr/local/bin/logcli # yq CLI cache -FROM registry.fedoraproject.org/fedora:36 as yq +FROM quay.io/fedora/fedora:36 as yq # renovate: datasource=github-releases depName=mikefarah/yq ARG YQ_VERSION=v4.29.2 @@ -93,7 +93,7 @@ ENV YQ_VERSION=${YQ_VERSION} RUN curl -L https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 > ./yq \ && install -o root -g root -m 0755 yq /usr/local/bin/yq -FROM registry.fedoraproject.org/fedora:36 as helm-docs +FROM quay.io/fedora/fedora:36 as helm-docs # renovate: datasource=github-releases depName=norwoodj/helm-docs ARG HELM_DOCS_VERSION=v1.11.0 @@ -103,7 +103,7 @@ RUN curl -L https://github.com/norwoodj/helm-docs/releases/download/${HELM_DOCS_ && install -o root -g root -m 0755 helm-docs /usr/local/bin/helm-docs # kubectl-krew CLI cache -FROM registry.fedoraproject.org/fedora:36 as kubectl-krew +FROM quay.io/fedora/fedora:36 as kubectl-krew # renovate: datasource=github-releases depName=kubernetes-sigs/krew ARG KREW_VERSION=v0.4.3 @@ -118,7 +118,7 @@ RUN set -x; mkdir -p /opt/krew; cd "/opt/krew" && \ mv "${KREW}" /opt/krew/krew # kubectl-krew CLI cache -FROM registry.fedoraproject.org/fedora:36 as mdbook +FROM quay.io/fedora/fedora:36 as mdbook # renovate: datasource=github-releases depName=kubernetes-sigs/krew ARG MDBOOK_VERSION=v0.4.18 @@ -130,7 +130,7 @@ RUN curl -L "https://github.com/rust-lang/mdBook/releases/download/${MDBOOK_VERS # Actual start of container build -FROM registry.fedoraproject.org/fedora:36 +FROM quay.io/fedora/fedora:36 ARG MAINTAINER="unmaintained" LABEL maintainer=$MAINTAINER diff --git a/infrastructure/system-upgrades/fedora-temperature-management.yaml b/infrastructure/system-upgrades/fedora-temperature-management.yaml index ca3b8eb8519e607c1fd877255aa4220360c97430..bf6702fc7ee13661821ac711f0b2adfaf01046de 100644 --- a/infrastructure/system-upgrades/fedora-temperature-management.yaml +++ b/infrastructure/system-upgrades/fedora-temperature-management.yaml @@ -63,6 +63,6 @@ spec: path: /host/run/system-upgrade/secrets/fedora version: 1.0.0 upgrade: - image: registry.fedoraproject.org/fedora:35 + image: quay.io/fedora/fedora:36 command: ["chroot", "/host"] args: ["sh", "/run/system-upgrade/secrets/fedora/install.sh"] diff --git a/infrastructure/system-upgrades/fedora.yaml b/infrastructure/system-upgrades/fedora.yaml index 6abf096e782852de1eb39c766b9e9614d129c364..8b7c10bb4d372fa8806c84464371613609d6c273 100644 --- a/infrastructure/system-upgrades/fedora.yaml +++ b/infrastructure/system-upgrades/fedora.yaml @@ -42,6 +42,6 @@ spec: path: /host/run/system-upgrade/secrets/fedora channel: http://calver/weekly upgrade: - image: registry.fedoraproject.org/fedora:35 + image: quay.io/fedora/fedora:36 command: ["chroot", "/host"] args: ["sh", "/run/system-upgrade/secrets/fedora/upgrade.sh"] diff --git a/infrastructure/system-upgrades/kubelet.yaml b/infrastructure/system-upgrades/kubelet.yaml index 7e8969e7259f133ce7c215be4eb0eadfb97f132d..b480938ca3dd9c9100a068501de5bd0b7e2768e0 100644 --- a/infrastructure/system-upgrades/kubelet.yaml +++ b/infrastructure/system-upgrades/kubelet.yaml @@ -47,6 +47,6 @@ spec: path: /host/run/system-upgrade/secrets/kubelet version: "1.0.0" upgrade: - image: registry.fedoraproject.org/fedora:35 + image: quay.io/fedora/fedora:36 command: ["chroot", "/host"] args: ["sh", "/run/system-upgrade/secrets/kubelet/upgrade.sh"] diff --git a/renovate.json b/renovate.json index deb1ca27a5cba0258f1a17503dbd901a865ad493..2b0a6d9eb8ea4425a65b65f978877ab5d465cfda 100644 --- a/renovate.json +++ b/renovate.json @@ -41,7 +41,7 @@ "packageRules": [ { "matchDatasources": ["docker"], - "matchPackageNames": ["registry.fedoraproject.org/fedora"], + "matchPackageNames": ["quay.io/fedora/fedora"], "allowedVersions": "<37" } ]