Skip to content

Revert "Merge pull request #20 from alexander-demichev/annotations" #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dgoodwin wants to merge 1 commit into from
Closed

Revert "Merge pull request #20 from alexander-demichev/annotations" #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hack/import-assets/providers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
2 changes: 1 addition & 1 deletion hack/import-assets/rbac_manifests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion ...uster-api_capi-operator_00_namespace.yaml → ...s/0000_30_capi-operator_00_namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 2 additions & 3 deletions ...pi_capi-operator_01_images.configmap.yaml → ...30_capi-operator_01_images.configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
1 change: 0 additions & 1 deletion ...api_capi-operator_02_service_account.yaml → ..._30_capi-operator_02_service_account.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 0 additions & 2 deletions ...ster-api_capi-operator_03_rbac_roles.yaml → .../0000_30_capi-operator_03_rbac_roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions ...r-api_capi-operator_04_rbac_bindings.yaml → ...00_30_capi-operator_04_rbac_bindings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion ...ster-api_capi-operator_11_deployment.yaml → .../0000_30_capi-operator_11_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion ...api_capi-operator_12_clusteroperator.yaml → ..._30_capi-operator_12_clusteroperator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 0 additions & 6 deletions ...cluster-api_core-cluster-api_03_rbac.yaml → ...cluster-api-core-cluster-api_03_rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand All @@ -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: ""
Expand Down Expand Up @@ -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: ""
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
7 changes: 0 additions & 7 deletions ...uster-api_infrastructure-aws_03_rbac.yaml → ...uster-api-infrastructure-aws_03_rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand All @@ -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: ""
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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: ""
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
10 changes: 0 additions & 10 deletions ...ter-api_infrastructure-azure_03_rbac.yaml → ...ter-api-infrastructure-azure_03_rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand All @@ -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: ""
Expand Down Expand Up @@ -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: ""
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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: ""
Expand All @@ -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: ""
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 0 additions & 6 deletions ...uster-api_infrastructure-gcp_03_rbac.yaml → ...uster-api-infrastructure-gcp_03_rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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: ""
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading