From c688cf32d8365f261ca6116319c8da6780d31c12 Mon Sep 17 00:00:00 2001 From: Ablai Akhazhanov Date: Tue, 12 Jul 2022 17:27:49 +0000 Subject: [PATCH] Upgrade cert-manager to 1.5.0 --- kubeflow/common/.krmignore | 2 +- kubeflow/common/cert-manager/Makefile | 2 +- .../cert-manager/base/kustomization.yaml | 10 ++++------ .../cert-manager/kubeflow-issuer/cluster-issuer.yaml | 2 +- .../cert-manager/kubeflow-issuer/kustomization.yaml | 0 .../overlays/letsencrypt/cluster-issuer.yaml | 2 +- .../overlays/letsencrypt/kustomization.yaml | 0 .../cert-manager/overlays/letsencrypt/params.env | 0 .../cert-manager/overlays/letsencrypt/params.yaml | 0 .../overlays/self-signed/kustomization.yaml | 0 kubeflow/common/cert-manager/kustomization.yaml | 2 +- 11 files changed, 9 insertions(+), 11 deletions(-) rename kubeflow/common/cert-manager/{cert-manager-1-3 => cert-manager-1-5}/cert-manager/base/kustomization.yaml (85%) rename kubeflow/common/cert-manager/{cert-manager-1-3 => cert-manager-1-5}/cert-manager/kubeflow-issuer/cluster-issuer.yaml (70%) rename kubeflow/common/cert-manager/{cert-manager-1-3 => cert-manager-1-5}/cert-manager/kubeflow-issuer/kustomization.yaml (100%) rename kubeflow/common/cert-manager/{cert-manager-1-3 => cert-manager-1-5}/cert-manager/overlays/letsencrypt/cluster-issuer.yaml (83%) rename kubeflow/common/cert-manager/{cert-manager-1-3 => cert-manager-1-5}/cert-manager/overlays/letsencrypt/kustomization.yaml (100%) rename kubeflow/common/cert-manager/{cert-manager-1-3 => cert-manager-1-5}/cert-manager/overlays/letsencrypt/params.env (100%) rename kubeflow/common/cert-manager/{cert-manager-1-3 => cert-manager-1-5}/cert-manager/overlays/letsencrypt/params.yaml (100%) rename kubeflow/common/cert-manager/{cert-manager-1-3 => cert-manager-1-5}/cert-manager/overlays/self-signed/kustomization.yaml (100%) diff --git a/kubeflow/common/.krmignore b/kubeflow/common/.krmignore index 0356b373..2a66a203 100644 --- a/kubeflow/common/.krmignore +++ b/kubeflow/common/.krmignore @@ -1,6 +1,6 @@ asm cert-manager/upstream/cert-manager/base/patches/crd-preserve-unknown-fields.yaml -cert-manager/cert-manager-1-3/cert-manager/overlays/letsencrypt/params.yaml +cert-manager/cert-manager-1-5/cert-manager/overlays/letsencrypt/params.yaml cloud-endpoints/base/params.yaml iap-ingress/base/params.yaml istio/upstream/profile-overlay.yaml diff --git a/kubeflow/common/cert-manager/Makefile b/kubeflow/common/cert-manager/Makefile index e789663c..0e8ae482 100644 --- a/kubeflow/common/cert-manager/Makefile +++ b/kubeflow/common/cert-manager/Makefile @@ -12,7 +12,7 @@ hydrate: mkdir -p $(build_dir)/cert-manager mkdir -p $(build_dir)/kubeflow-issuer kustomize build -o $(build_dir)/cert-manager ./ - kustomize build -o $(build_dir)/kubeflow-issuer ./cert-manager-1-3/cert-manager/kubeflow-issuer + kustomize build -o $(build_dir)/kubeflow-issuer ./cert-manager-1-5/cert-manager/kubeflow-issuer .PHONY: apply apply: hydrate diff --git a/kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/base/kustomization.yaml b/kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/base/kustomization.yaml similarity index 85% rename from kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/base/kustomization.yaml rename to kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/base/kustomization.yaml index a16654e0..62138592 100644 --- a/kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/base/kustomization.yaml +++ b/kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/base/kustomization.yaml @@ -1,16 +1,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: -- https://github.com/jetstack/cert-manager/releases/download/v1.3.0/cert-manager.yaml - +- https://github.com/jetstack/cert-manager/releases/download/v1.5.0/cert-manager.yaml images: - name: quay.io/jetstack/cert-manager-controller newName: quay.io/jetstack/cert-manager-controller - newTag: v1.3.0 + newTag: v1.5.0 - name: quay.io/jetstack/cert-manager-cainjector newName: quay.io/jetstack/cert-manager-cainjector - newTag: v1.3.0 + newTag: v1.5.0 - name: quay.io/jetstack/cert-manager-webhook newName: quay.io/jetstack/cert-manager-webhook - newTag: v1.3.0 + newTag: v1.5.0 diff --git a/kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/kubeflow-issuer/cluster-issuer.yaml b/kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/kubeflow-issuer/cluster-issuer.yaml similarity index 70% rename from kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/kubeflow-issuer/cluster-issuer.yaml rename to kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/kubeflow-issuer/cluster-issuer.yaml index eaf97030..ccbc1ad6 100644 --- a/kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/kubeflow-issuer/cluster-issuer.yaml +++ b/kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/kubeflow-issuer/cluster-issuer.yaml @@ -1,4 +1,4 @@ -apiVersion: cert-manager.io/v1alpha2 +apiVersion: cert-manager.io/v1 kind: ClusterIssuer metadata: name: kubeflow-self-signing-issuer diff --git a/kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/kubeflow-issuer/kustomization.yaml b/kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/kubeflow-issuer/kustomization.yaml similarity index 100% rename from kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/kubeflow-issuer/kustomization.yaml rename to kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/kubeflow-issuer/kustomization.yaml diff --git a/kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/overlays/letsencrypt/cluster-issuer.yaml b/kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/overlays/letsencrypt/cluster-issuer.yaml similarity index 83% rename from kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/overlays/letsencrypt/cluster-issuer.yaml rename to kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/overlays/letsencrypt/cluster-issuer.yaml index 2b985722..86770c68 100644 --- a/kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/overlays/letsencrypt/cluster-issuer.yaml +++ b/kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/overlays/letsencrypt/cluster-issuer.yaml @@ -1,4 +1,4 @@ -apiVersion: cert-manager.io/v1alpha2 +apiVersion: cert-manager.io/v1 kind: ClusterIssuer metadata: name: letsencrypt-prod diff --git a/kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/overlays/letsencrypt/kustomization.yaml b/kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/overlays/letsencrypt/kustomization.yaml similarity index 100% rename from kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/overlays/letsencrypt/kustomization.yaml rename to kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/overlays/letsencrypt/kustomization.yaml diff --git a/kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/overlays/letsencrypt/params.env b/kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/overlays/letsencrypt/params.env similarity index 100% rename from kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/overlays/letsencrypt/params.env rename to kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/overlays/letsencrypt/params.env diff --git a/kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/overlays/letsencrypt/params.yaml b/kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/overlays/letsencrypt/params.yaml similarity index 100% rename from kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/overlays/letsencrypt/params.yaml rename to kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/overlays/letsencrypt/params.yaml diff --git a/kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/overlays/self-signed/kustomization.yaml b/kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/overlays/self-signed/kustomization.yaml similarity index 100% rename from kubeflow/common/cert-manager/cert-manager-1-3/cert-manager/overlays/self-signed/kustomization.yaml rename to kubeflow/common/cert-manager/cert-manager-1-5/cert-manager/overlays/self-signed/kustomization.yaml diff --git a/kubeflow/common/cert-manager/kustomization.yaml b/kubeflow/common/cert-manager/kustomization.yaml index 3feeac29..5d77a994 100755 --- a/kubeflow/common/cert-manager/kustomization.yaml +++ b/kubeflow/common/cert-manager/kustomization.yaml @@ -1,4 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ./cert-manager-1-3/cert-manager/base +- ./cert-manager-1-5/cert-manager/base