From cb1f2565d2641413819c419bb2511855002684f1 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 12 Nov 2022 00:28:16 +0100
Subject: [PATCH] chore: Replace old fedora:35 with new fedora:36 images
This patch replaces almost all occations where Fedora 35 is used with the old
registry.fedoraproject.org/fedora registry and replaces it with the new
quay.io-based fedora repository and version 36.
---
clusters/k8s01/system-upgrades/dns.yaml | 2 +-
images/demo/Dockerfile | 2 +-
images/koolbox/Dockerfile | 24 +++++++++----------
.../fedora-temperature-management.yaml | 2 +-
infrastructure/system-upgrades/fedora.yaml | 2 +-
infrastructure/system-upgrades/kubelet.yaml | 2 +-
renovate.json | 2 +-
7 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/clusters/k8s01/system-upgrades/dns.yaml b/clusters/k8s01/system-upgrades/dns.yaml
index c85f6ef65..bdaef0728 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 fc8df6a45..937d26591 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 372ab16cc..5ef1d4138 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 ca3b8eb85..bf6702fc7 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 6abf096e7..8b7c10bb4 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 7e8969e72..b480938ca 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 deb1ca27a..2b0a6d9eb 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"
}
]
--
GitLab