diff --git a/hack/import-assets/providers.go b/hack/import-assets/providers.go index 82f956ad8..2c65540f5 100644 --- a/hack/import-assets/providers.go +++ b/hack/import-assets/providers.go @@ -153,7 +153,7 @@ func (p *provider) writeRBACComponentsToManifests(objs []unstructured.Unstructur return err } - fName := strings.ToLower("0000_30_cluster-api_" + p.providerTypeName() + "-" + p.name + "_03_rbac.yaml") + fName := strings.ToLower("0000_30_cluster-api-" + p.providerTypeName() + "-" + p.name + "_03_rbac.yaml") return os.WriteFile(path.Join(manifestsPath, fName), ensureNewLine(combined), 0600) } diff --git a/hack/import-assets/rbac_manifests.go b/hack/import-assets/rbac_manifests.go index bebe08f55..09a1f177a 100644 --- a/hack/import-assets/rbac_manifests.go +++ b/hack/import-assets/rbac_manifests.go @@ -14,7 +14,7 @@ import ( var ( assetsDir = path.Join(projDir, "assets", "capi-operator") - outFile = path.Join(projDir, "manifests", "0000_30_cluster-api_operator_03_rbac_roles.yaml") + outFile = path.Join(projDir, "manifests", "0000_30_cluster-api-operator_03_rbac_roles.yaml") annotations = map[string]string{ "exclude.release.openshift.io/internal-openshift-hosted": "true", "include.release.openshift.io/self-managed-high-availability": "true", diff --git a/manifests/0000_30_cluster-api_capi-operator_00_namespace.yaml b/manifests/0000_30_capi-operator_00_namespace.yaml similarity index 87% rename from manifests/0000_30_cluster-api_capi-operator_00_namespace.yaml rename to manifests/0000_30_capi-operator_00_namespace.yaml index 03dddba77..60ed66658 100644 --- a/manifests/0000_30_cluster-api_capi-operator_00_namespace.yaml +++ b/manifests/0000_30_capi-operator_00_namespace.yaml @@ -5,7 +5,6 @@ metadata: include.release.openshift.io/single-node-developer: "true" include.release.openshift.io/self-managed-high-availability: "true" exclude.release.openshift.io/internal-openshift-hosted: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" openshift.io/node-selector: "" workload.openshift.io/allowed: "management" labels: diff --git a/manifests/0000_30_cluster-api_capi-operator_01_images.configmap.yaml b/manifests/0000_30_capi-operator_01_images.configmap.yaml similarity index 83% rename from manifests/0000_30_cluster-api_capi-operator_01_images.configmap.yaml rename to manifests/0000_30_capi-operator_01_images.configmap.yaml index f1133c42d..873d0ca24 100644 --- a/manifests/0000_30_cluster-api_capi-operator_01_images.configmap.yaml +++ b/manifests/0000_30_capi-operator_01_images.configmap.yaml @@ -7,11 +7,10 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" exclude.release.openshift.io/internal-openshift-hosted: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" data: images.json: > { - "cluster-capi-operator": "registry.ci.openshift.org/openshift:cluster-capi-operator", + "cluster-capi-operator": "quay.io/openshift/origin-cluster-capi-operator", "cluster-api:operator": "quay.io/asalkeld/cluster-api-operator-amd64:dev", "bootstrap-kubeadm:manager": "k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v0.4.3", "controlplane-kubeadm:manager": "k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v0.4.3", @@ -20,5 +19,5 @@ data: "infrastructure-azure:manager": "us.gcr.io/k8s-artifacts-prod/cluster-api-azure/cluster-api-azure-controller:v0.5.2", "infrastructure-metal3:ip-address-manager": "quay.io/metal3-io/ip-address-manager:v0.1.0", "infrastructure-metal3:manager": "quay.io/metal3-io/cluster-api-provider-metal3:v0.5.0", - "kube-rbac-proxy": "registry.ci.openshift.org/openshift:kube-rbac-proxy" + "kube-rbac-proxy": "gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0" } diff --git a/manifests/0000_30_cluster-api_capi-operator_02_service_account.yaml b/manifests/0000_30_capi-operator_02_service_account.yaml similarity index 84% rename from manifests/0000_30_cluster-api_capi-operator_02_service_account.yaml rename to manifests/0000_30_capi-operator_02_service_account.yaml index 9311014f4..dfa4a2927 100644 --- a/manifests/0000_30_cluster-api_capi-operator_02_service_account.yaml +++ b/manifests/0000_30_capi-operator_02_service_account.yaml @@ -8,4 +8,3 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" diff --git a/manifests/0000_30_cluster-api_capi-operator_03_rbac_roles.yaml b/manifests/0000_30_capi-operator_03_rbac_roles.yaml similarity index 86% rename from manifests/0000_30_cluster-api_capi-operator_03_rbac_roles.yaml rename to manifests/0000_30_capi-operator_03_rbac_roles.yaml index 67846030c..c3a8d6651 100644 --- a/manifests/0000_30_cluster-api_capi-operator_03_rbac_roles.yaml +++ b/manifests/0000_30_capi-operator_03_rbac_roles.yaml @@ -6,7 +6,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" name: cluster-capi-operator rules: - apiGroups: @@ -23,7 +22,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" name: cluster-capi-operator namespace: openshift-cluster-api rules: diff --git a/manifests/0000_30_cluster-api_capi-operator_04_rbac_bindings.yaml b/manifests/0000_30_capi-operator_04_rbac_bindings.yaml similarity index 89% rename from manifests/0000_30_cluster-api_capi-operator_04_rbac_bindings.yaml rename to manifests/0000_30_capi-operator_04_rbac_bindings.yaml index 790aebde7..04cf069bc 100644 --- a/manifests/0000_30_cluster-api_capi-operator_04_rbac_bindings.yaml +++ b/manifests/0000_30_capi-operator_04_rbac_bindings.yaml @@ -7,7 +7,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" roleRef: kind: ClusterRole name: cluster-capi-operator @@ -26,7 +25,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" roleRef: kind: Role name: cluster-capi-operator diff --git a/manifests/0000_30_cluster-api_capi-operator_11_deployment.yaml b/manifests/0000_30_capi-operator_11_deployment.yaml similarity index 96% rename from manifests/0000_30_cluster-api_capi-operator_11_deployment.yaml rename to manifests/0000_30_capi-operator_11_deployment.yaml index c92c9fc1a..b60831199 100644 --- a/manifests/0000_30_cluster-api_capi-operator_11_deployment.yaml +++ b/manifests/0000_30_capi-operator_11_deployment.yaml @@ -8,7 +8,6 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" exclude.release.openshift.io/internal-openshift-hosted: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: k8s-app: cluster-capi-operator spec: diff --git a/manifests/0000_30_cluster-api_capi-operator_12_clusteroperator.yaml b/manifests/0000_30_capi-operator_12_clusteroperator.yaml similarity index 93% rename from manifests/0000_30_cluster-api_capi-operator_12_clusteroperator.yaml rename to manifests/0000_30_capi-operator_12_clusteroperator.yaml index 67f9d5d11..56cd4b538 100644 --- a/manifests/0000_30_cluster-api_capi-operator_12_clusteroperator.yaml +++ b/manifests/0000_30_capi-operator_12_clusteroperator.yaml @@ -6,7 +6,6 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" exclude.release.openshift.io/internal-openshift-hosted: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" spec: {} status: versions: diff --git a/manifests/0000_30_cluster-api_core-cluster-api_03_rbac.yaml b/manifests/0000_30_cluster-api-core-cluster-api_03_rbac.yaml similarity index 94% rename from manifests/0000_30_cluster-api_core-cluster-api_03_rbac.yaml rename to manifests/0000_30_cluster-api-core-cluster-api_03_rbac.yaml index 5d6c71dfa..a80e992a2 100644 --- a/manifests/0000_30_cluster-api_core-cluster-api_03_rbac.yaml +++ b/manifests/0000_30_cluster-api-core-cluster-api_03_rbac.yaml @@ -5,7 +5,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: cluster-api clusterctl.cluster.x-k8s.io: "" @@ -19,7 +18,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: cluster-api clusterctl.cluster.x-k8s.io: "" @@ -56,7 +54,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: cluster-api clusterctl.cluster.x-k8s.io: "" @@ -70,7 +67,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/aggregate-to-manager: "true" cluster.x-k8s.io/provider: cluster-api @@ -349,7 +345,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: cluster-api @@ -372,7 +367,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: cluster-api diff --git a/manifests/0000_30_cluster-api_infrastructure-aws_03_rbac.yaml b/manifests/0000_30_cluster-api-infrastructure-aws_03_rbac.yaml similarity index 95% rename from manifests/0000_30_cluster-api_infrastructure-aws_03_rbac.yaml rename to manifests/0000_30_cluster-api-infrastructure-aws_03_rbac.yaml index be0e1133c..a5fffce40 100644 --- a/manifests/0000_30_cluster-api_infrastructure-aws_03_rbac.yaml +++ b/manifests/0000_30_cluster-api-infrastructure-aws_03_rbac.yaml @@ -5,7 +5,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: infrastructure-aws clusterctl.cluster.x-k8s.io: "" @@ -20,7 +19,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: infrastructure-aws clusterctl.cluster.x-k8s.io: "" @@ -73,7 +71,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-aws @@ -378,7 +375,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: infrastructure-aws clusterctl.cluster.x-k8s.io: "" @@ -404,7 +400,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-aws @@ -427,7 +422,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-aws @@ -449,7 +443,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-aws diff --git a/manifests/0000_30_cluster-api_infrastructure-azure_03_rbac.yaml b/manifests/0000_30_cluster-api-infrastructure-azure_03_rbac.yaml similarity index 94% rename from manifests/0000_30_cluster-api_infrastructure-azure_03_rbac.yaml rename to manifests/0000_30_cluster-api-infrastructure-azure_03_rbac.yaml index f3e649953..cfdfa9126 100644 --- a/manifests/0000_30_cluster-api_infrastructure-azure_03_rbac.yaml +++ b/manifests/0000_30_cluster-api-infrastructure-azure_03_rbac.yaml @@ -5,7 +5,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: infrastructure-azure clusterctl.cluster.x-k8s.io: "" @@ -19,7 +18,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: infrastructure-azure clusterctl.cluster.x-k8s.io: "" @@ -72,7 +70,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: infrastructure-azure clusterctl.cluster.x-k8s.io: "" @@ -115,7 +112,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-azure @@ -369,7 +365,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: infrastructure-azure clusterctl.cluster.x-k8s.io: "" @@ -387,7 +382,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: infrastructure-azure clusterctl.cluster.x-k8s.io: "" @@ -413,7 +407,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-azure @@ -436,7 +429,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-azure @@ -459,7 +451,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-azure @@ -481,7 +472,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-azure diff --git a/manifests/0000_30_cluster-api_infrastructure-gcp_03_rbac.yaml b/manifests/0000_30_cluster-api-infrastructure-gcp_03_rbac.yaml similarity index 93% rename from manifests/0000_30_cluster-api_infrastructure-gcp_03_rbac.yaml rename to manifests/0000_30_cluster-api-infrastructure-gcp_03_rbac.yaml index 44ba1797b..1fd08f995 100644 --- a/manifests/0000_30_cluster-api_infrastructure-gcp_03_rbac.yaml +++ b/manifests/0000_30_cluster-api-infrastructure-gcp_03_rbac.yaml @@ -5,7 +5,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: infrastructure-gcp clusterctl.cluster.x-k8s.io: "" @@ -58,7 +57,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-gcp @@ -150,7 +148,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: infrastructure-gcp clusterctl.cluster.x-k8s.io: "" @@ -176,7 +173,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-gcp @@ -199,7 +195,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-gcp @@ -221,7 +216,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-gcp diff --git a/manifests/0000_30_cluster-api_infrastructure-metal3_03_rbac.yaml b/manifests/0000_30_cluster-api-infrastructure-metal3_03_rbac.yaml similarity index 94% rename from manifests/0000_30_cluster-api_infrastructure-metal3_03_rbac.yaml rename to manifests/0000_30_cluster-api-infrastructure-metal3_03_rbac.yaml index 47c022523..088859175 100644 --- a/manifests/0000_30_cluster-api_infrastructure-metal3_03_rbac.yaml +++ b/manifests/0000_30_cluster-api-infrastructure-metal3_03_rbac.yaml @@ -5,7 +5,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: infrastructure-metal3 clusterctl.cluster.x-k8s.io: "" @@ -19,7 +18,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: infrastructure-metal3 clusterctl.cluster.x-k8s.io: "" @@ -33,7 +31,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: infrastructure-metal3 clusterctl.cluster.x-k8s.io: "" @@ -86,7 +83,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: infrastructure-metal3 clusterctl.cluster.x-k8s.io: "" @@ -127,7 +123,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-metal3 @@ -418,7 +413,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-metal3 @@ -530,7 +524,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-metal3 @@ -553,7 +546,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-metal3 @@ -576,7 +568,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-metal3 @@ -598,7 +589,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-metal3 diff --git a/manifests/0000_30_cluster-api_infrastructure-openstack_03_rbac.yaml b/manifests/0000_30_cluster-api-infrastructure-openstack_03_rbac.yaml similarity index 93% rename from manifests/0000_30_cluster-api_infrastructure-openstack_03_rbac.yaml rename to manifests/0000_30_cluster-api-infrastructure-openstack_03_rbac.yaml index a257ea1d2..a4ccff010 100644 --- a/manifests/0000_30_cluster-api_infrastructure-openstack_03_rbac.yaml +++ b/manifests/0000_30_cluster-api-infrastructure-openstack_03_rbac.yaml @@ -5,7 +5,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: infrastructure-openstack clusterctl.cluster.x-k8s.io: "" @@ -19,7 +18,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: cluster.x-k8s.io/provider: infrastructure-openstack clusterctl.cluster.x-k8s.io: "" @@ -72,7 +70,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-openstack @@ -164,7 +161,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-openstack @@ -187,7 +183,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: cluster.x-k8s.io/provider: infrastructure-openstack diff --git a/manifests/0000_30_cluster-api_operator_03_rbac_roles.yaml b/manifests/0000_30_cluster-api-operator_03_rbac_roles.yaml similarity index 92% rename from manifests/0000_30_cluster-api_operator_03_rbac_roles.yaml rename to manifests/0000_30_cluster-api-operator_03_rbac_roles.yaml index 15bc3a545..d27812995 100644 --- a/manifests/0000_30_cluster-api_operator_03_rbac_roles.yaml +++ b/manifests/0000_30_cluster-api-operator_03_rbac_roles.yaml @@ -5,7 +5,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: clusterctl.cluster.x-k8s.io/core: capi-operator name: capi-operator-metrics-reader @@ -22,7 +21,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: clusterctl.cluster.x-k8s.io/core: capi-operator name: capi-operator-proxy-role @@ -47,7 +45,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: clusterctl.cluster.x-k8s.io/core: capi-operator name: capi-operator-manager-rolebinding @@ -67,7 +64,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: clusterctl.cluster.x-k8s.io/core: capi-operator name: capi-operator-proxy-rolebinding @@ -87,7 +83,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: clusterctl.cluster.x-k8s.io/core: capi-operator name: capi-operator-leader-election-role @@ -139,7 +134,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" labels: clusterctl.cluster.x-k8s.io/core: capi-operator name: capi-operator-leader-election-rolebinding @@ -160,7 +154,6 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - release.openshift.io/feature-gate: "TechPreviewNoUpgrade" creationTimestamp: null labels: clusterctl.cluster.x-k8s.io/core: capi-operator diff --git a/manifests/image-references b/manifests/image-references index a508a08c0..1472cebcc 100644 --- a/manifests/image-references +++ b/manifests/image-references @@ -10,3 +10,4 @@ spec: from: kind: DockerImage name: registry.ci.openshift.org/openshift:kube-rbac-proxy +