From db81f8221773483a70d67f1ef2dec94a5a3fab3f Mon Sep 17 00:00:00 2001 From: Liang Xia Date: Tue, 3 Mar 2026 18:28:00 +0800 Subject: [PATCH] Unify cert-manager-operator config --- .../cert-manager-operator/operator.yaml | 40 ---------------- .../cert-manager-operator/operator.yaml | 46 ------------------ .../cert-manager-operator/operator.yaml | 40 ---------------- .../cert-manager-operator/operator.yaml | 47 ------------------- .../cert-manager-operator/operator.yaml | 40 ---------------- .../cert-manager-operator/operator.yaml | 40 ---------------- .../cert-manager-operator/operator.yaml | 47 ------------------- .../cert-manager-operator/operator.yaml | 46 ------------------ .../cert-manager-operator/operator.yaml | 46 ------------------ .../cert-manager-operator/operator.yaml | 3 +- .../cert-manager-operator/operator.yaml | 5 +- 11 files changed, 6 insertions(+), 394 deletions(-) delete mode 100644 clusters/build-clusters/build02/cert-manager-operator/operator.yaml delete mode 100644 clusters/build-clusters/build03/cert-manager-operator/operator.yaml delete mode 100644 clusters/build-clusters/build04/cert-manager-operator/operator.yaml delete mode 100644 clusters/build-clusters/build05/cert-manager-operator/operator.yaml delete mode 100644 clusters/build-clusters/build06/cert-manager-operator/operator.yaml delete mode 100644 clusters/build-clusters/build07/cert-manager-operator/operator.yaml delete mode 100644 clusters/build-clusters/build08/cert-manager-operator/operator.yaml delete mode 100644 clusters/build-clusters/build09/cert-manager-operator/operator.yaml delete mode 100644 clusters/build-clusters/build10/cert-manager-operator/operator.yaml rename clusters/build-clusters/{build01 => common}/cert-manager-operator/operator.yaml (95%) diff --git a/clusters/build-clusters/build02/cert-manager-operator/operator.yaml b/clusters/build-clusters/build02/cert-manager-operator/operator.yaml deleted file mode 100644 index 5a3e8232b1d2e..0000000000000 --- a/clusters/build-clusters/build02/cert-manager-operator/operator.yaml +++ /dev/null @@ -1,40 +0,0 @@ -kind: Namespace -apiVersion: v1 -metadata: - annotations: - argocd.argoproj.io/sync-options: Prune=false,Delete=confirm - name: cert-manager-operator ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: cert-manager-operator - namespace: cert-manager-operator -spec: - targetNamespaces: - - cert-manager-operator ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - labels: - operators.coreos.com/openshift-cert-manager-operator.cert-manager-operator: "" - name: openshift-cert-manager-operator - namespace: cert-manager-operator -spec: - channel: stable-v1 - installPlanApproval: Automatic - name: openshift-cert-manager-operator - source: redhat-operators - sourceNamespace: openshift-marketplace ---- -apiVersion: operator.openshift.io/v1alpha1 -kind: CertManager -metadata: - name: cluster -spec: - unsupportedConfigOverrides: - controller: - args: - - --dns01-recursive-nameservers=8.8.8.8:53 - - --dns01-recursive-nameservers-only diff --git a/clusters/build-clusters/build03/cert-manager-operator/operator.yaml b/clusters/build-clusters/build03/cert-manager-operator/operator.yaml deleted file mode 100644 index 95f537ddb3e99..0000000000000 --- a/clusters/build-clusters/build03/cert-manager-operator/operator.yaml +++ /dev/null @@ -1,46 +0,0 @@ -# !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init -# Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. -# Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ -# or, alternatively, modifying the cluster-init tool itself. - -apiVersion: v1 -kind: Namespace -metadata: - annotations: - argocd.argoproj.io/sync-options: Prune=false,Delete=confirm - name: cert-manager-operator ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: cert-manager-operator - namespace: cert-manager-operator -spec: - targetNamespaces: - - cert-manager-operator ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - labels: - operators.coreos.com/openshift-cert-manager-operator.cert-manager-operator: "" - name: openshift-cert-manager-operator - namespace: cert-manager-operator -spec: - channel: stable-v1 - installPlanApproval: Automatic - name: openshift-cert-manager-operator - source: redhat-operators - sourceNamespace: openshift-marketplace ---- -apiVersion: operator.openshift.io/v1alpha1 -kind: CertManager -metadata: - name: cluster -spec: - unsupportedConfigOverrides: - controller: - args: - - --dns01-recursive-nameservers=8.8.8.8:53 - - --dns01-recursive-nameservers-only diff --git a/clusters/build-clusters/build04/cert-manager-operator/operator.yaml b/clusters/build-clusters/build04/cert-manager-operator/operator.yaml deleted file mode 100644 index 5a3e8232b1d2e..0000000000000 --- a/clusters/build-clusters/build04/cert-manager-operator/operator.yaml +++ /dev/null @@ -1,40 +0,0 @@ -kind: Namespace -apiVersion: v1 -metadata: - annotations: - argocd.argoproj.io/sync-options: Prune=false,Delete=confirm - name: cert-manager-operator ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: cert-manager-operator - namespace: cert-manager-operator -spec: - targetNamespaces: - - cert-manager-operator ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - labels: - operators.coreos.com/openshift-cert-manager-operator.cert-manager-operator: "" - name: openshift-cert-manager-operator - namespace: cert-manager-operator -spec: - channel: stable-v1 - installPlanApproval: Automatic - name: openshift-cert-manager-operator - source: redhat-operators - sourceNamespace: openshift-marketplace ---- -apiVersion: operator.openshift.io/v1alpha1 -kind: CertManager -metadata: - name: cluster -spec: - unsupportedConfigOverrides: - controller: - args: - - --dns01-recursive-nameservers=8.8.8.8:53 - - --dns01-recursive-nameservers-only diff --git a/clusters/build-clusters/build05/cert-manager-operator/operator.yaml b/clusters/build-clusters/build05/cert-manager-operator/operator.yaml deleted file mode 100644 index 699848ace4b09..0000000000000 --- a/clusters/build-clusters/build05/cert-manager-operator/operator.yaml +++ /dev/null @@ -1,47 +0,0 @@ -# !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init -# Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. -# Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ -# or, alternatively, modifying the cluster-init tool itself. - -apiVersion: v1 -kind: Namespace -metadata: - annotations: - argocd.argoproj.io/sync-options: Prune=false,Delete=confirm - name: cert-manager-operator ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: cert-manager-operator - namespace: cert-manager-operator -spec: - targetNamespaces: - - cert-manager-operator ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - labels: - operators.coreos.com/openshift-cert-manager-operator.cert-manager-operator: "" - name: openshift-cert-manager-operator - namespace: cert-manager-operator -spec: - channel: stable-v1 - installPlanApproval: Automatic - name: openshift-cert-manager-operator - source: redhat-operators - sourceNamespace: openshift-marketplace - startingCSV: cert-manager-operator.v1.18.0 ---- -apiVersion: operator.openshift.io/v1alpha1 -kind: CertManager -metadata: - name: cluster -spec: - unsupportedConfigOverrides: - controller: - args: - - --dns01-recursive-nameservers=8.8.8.8:53 - - --dns01-recursive-nameservers-only diff --git a/clusters/build-clusters/build06/cert-manager-operator/operator.yaml b/clusters/build-clusters/build06/cert-manager-operator/operator.yaml deleted file mode 100644 index 5a3e8232b1d2e..0000000000000 --- a/clusters/build-clusters/build06/cert-manager-operator/operator.yaml +++ /dev/null @@ -1,40 +0,0 @@ -kind: Namespace -apiVersion: v1 -metadata: - annotations: - argocd.argoproj.io/sync-options: Prune=false,Delete=confirm - name: cert-manager-operator ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: cert-manager-operator - namespace: cert-manager-operator -spec: - targetNamespaces: - - cert-manager-operator ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - labels: - operators.coreos.com/openshift-cert-manager-operator.cert-manager-operator: "" - name: openshift-cert-manager-operator - namespace: cert-manager-operator -spec: - channel: stable-v1 - installPlanApproval: Automatic - name: openshift-cert-manager-operator - source: redhat-operators - sourceNamespace: openshift-marketplace ---- -apiVersion: operator.openshift.io/v1alpha1 -kind: CertManager -metadata: - name: cluster -spec: - unsupportedConfigOverrides: - controller: - args: - - --dns01-recursive-nameservers=8.8.8.8:53 - - --dns01-recursive-nameservers-only diff --git a/clusters/build-clusters/build07/cert-manager-operator/operator.yaml b/clusters/build-clusters/build07/cert-manager-operator/operator.yaml deleted file mode 100644 index 3c1555280044b..0000000000000 --- a/clusters/build-clusters/build07/cert-manager-operator/operator.yaml +++ /dev/null @@ -1,40 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - annotations: - argocd.argoproj.io/sync-options: Prune=false,Delete=confirm - name: cert-manager-operator ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: cert-manager-operator - namespace: cert-manager-operator -spec: - targetNamespaces: - - cert-manager-operator ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - labels: - operators.coreos.com/openshift-cert-manager-operator.cert-manager-operator: "" - name: openshift-cert-manager-operator - namespace: cert-manager-operator -spec: - channel: stable-v1 - installPlanApproval: Automatic - name: openshift-cert-manager-operator - source: redhat-operators - sourceNamespace: openshift-marketplace ---- -apiVersion: operator.openshift.io/v1alpha1 -kind: CertManager -metadata: - name: cluster -spec: - unsupportedConfigOverrides: - controller: - args: - - --dns01-recursive-nameservers=8.8.8.8:53 - - --dns01-recursive-nameservers-only diff --git a/clusters/build-clusters/build08/cert-manager-operator/operator.yaml b/clusters/build-clusters/build08/cert-manager-operator/operator.yaml deleted file mode 100644 index 5123dc33a3e82..0000000000000 --- a/clusters/build-clusters/build08/cert-manager-operator/operator.yaml +++ /dev/null @@ -1,47 +0,0 @@ -# !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init -# Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. -# Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ -# or, alternatively, modifying the cluster-init tool itself. - -apiVersion: v1 -kind: Namespace -metadata: - annotations: - argocd.argoproj.io/sync-options: Prune=false,Delete=confirm - name: cert-manager-operator ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: cert-manager-operator - namespace: cert-manager-operator -spec: - targetNamespaces: - - cert-manager-operator ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - labels: - operators.coreos.com/openshift-cert-manager-operator.cert-manager-operator: "" - name: openshift-cert-manager-operator - namespace: cert-manager-operator -spec: - channel: stable-v1 - installPlanApproval: Automatic - name: openshift-cert-manager-operator - source: redhat-operators - sourceNamespace: openshift-marketplace - startingCSV: cert-manager-operator.v1.17.0 ---- -apiVersion: operator.openshift.io/v1alpha1 -kind: CertManager -metadata: - name: cluster -spec: - unsupportedConfigOverrides: - controller: - args: - - --dns01-recursive-nameservers=8.8.8.8:53 - - --dns01-recursive-nameservers-only diff --git a/clusters/build-clusters/build09/cert-manager-operator/operator.yaml b/clusters/build-clusters/build09/cert-manager-operator/operator.yaml deleted file mode 100644 index 95f537ddb3e99..0000000000000 --- a/clusters/build-clusters/build09/cert-manager-operator/operator.yaml +++ /dev/null @@ -1,46 +0,0 @@ -# !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init -# Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. -# Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ -# or, alternatively, modifying the cluster-init tool itself. - -apiVersion: v1 -kind: Namespace -metadata: - annotations: - argocd.argoproj.io/sync-options: Prune=false,Delete=confirm - name: cert-manager-operator ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: cert-manager-operator - namespace: cert-manager-operator -spec: - targetNamespaces: - - cert-manager-operator ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - labels: - operators.coreos.com/openshift-cert-manager-operator.cert-manager-operator: "" - name: openshift-cert-manager-operator - namespace: cert-manager-operator -spec: - channel: stable-v1 - installPlanApproval: Automatic - name: openshift-cert-manager-operator - source: redhat-operators - sourceNamespace: openshift-marketplace ---- -apiVersion: operator.openshift.io/v1alpha1 -kind: CertManager -metadata: - name: cluster -spec: - unsupportedConfigOverrides: - controller: - args: - - --dns01-recursive-nameservers=8.8.8.8:53 - - --dns01-recursive-nameservers-only diff --git a/clusters/build-clusters/build10/cert-manager-operator/operator.yaml b/clusters/build-clusters/build10/cert-manager-operator/operator.yaml deleted file mode 100644 index 95f537ddb3e99..0000000000000 --- a/clusters/build-clusters/build10/cert-manager-operator/operator.yaml +++ /dev/null @@ -1,46 +0,0 @@ -# !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init -# Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. -# Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ -# or, alternatively, modifying the cluster-init tool itself. - -apiVersion: v1 -kind: Namespace -metadata: - annotations: - argocd.argoproj.io/sync-options: Prune=false,Delete=confirm - name: cert-manager-operator ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: cert-manager-operator - namespace: cert-manager-operator -spec: - targetNamespaces: - - cert-manager-operator ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - labels: - operators.coreos.com/openshift-cert-manager-operator.cert-manager-operator: "" - name: openshift-cert-manager-operator - namespace: cert-manager-operator -spec: - channel: stable-v1 - installPlanApproval: Automatic - name: openshift-cert-manager-operator - source: redhat-operators - sourceNamespace: openshift-marketplace ---- -apiVersion: operator.openshift.io/v1alpha1 -kind: CertManager -metadata: - name: cluster -spec: - unsupportedConfigOverrides: - controller: - args: - - --dns01-recursive-nameservers=8.8.8.8:53 - - --dns01-recursive-nameservers-only diff --git a/clusters/build-clusters/build01/cert-manager-operator/operator.yaml b/clusters/build-clusters/common/cert-manager-operator/operator.yaml similarity index 95% rename from clusters/build-clusters/build01/cert-manager-operator/operator.yaml rename to clusters/build-clusters/common/cert-manager-operator/operator.yaml index 5a3e8232b1d2e..090ec0a96496c 100644 --- a/clusters/build-clusters/build01/cert-manager-operator/operator.yaml +++ b/clusters/build-clusters/common/cert-manager-operator/operator.yaml @@ -1,5 +1,5 @@ -kind: Namespace apiVersion: v1 +kind: Namespace metadata: annotations: argocd.argoproj.io/sync-options: Prune=false,Delete=confirm @@ -27,6 +27,7 @@ spec: name: openshift-cert-manager-operator source: redhat-operators sourceNamespace: openshift-marketplace + startingCSV: cert-manager-operator.v1.18.0 --- apiVersion: operator.openshift.io/v1alpha1 kind: CertManager diff --git a/clusters/hosted-mgmt/cert-manager-operator/operator.yaml b/clusters/hosted-mgmt/cert-manager-operator/operator.yaml index 0b7e925daa180..090ec0a96496c 100644 --- a/clusters/hosted-mgmt/cert-manager-operator/operator.yaml +++ b/clusters/hosted-mgmt/cert-manager-operator/operator.yaml @@ -1,6 +1,8 @@ -kind: Namespace apiVersion: v1 +kind: Namespace metadata: + annotations: + argocd.argoproj.io/sync-options: Prune=false,Delete=confirm name: cert-manager-operator --- apiVersion: operators.coreos.com/v1 @@ -25,6 +27,7 @@ spec: name: openshift-cert-manager-operator source: redhat-operators sourceNamespace: openshift-marketplace + startingCSV: cert-manager-operator.v1.18.0 --- apiVersion: operator.openshift.io/v1alpha1 kind: CertManager