Skip to content

cvo: Rename the API object for CVOConfig to ClusterVersion #549

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

Merged
openshift-merge-robot merged 1 commit into from
Nov 2, 2018
Merged

cvo: Rename the API object for CVOConfig to ClusterVersion #549

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
33 changes: 33 additions & 0 deletions pkg/asset/manifests/content/bootkube/cvo-overrides.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,40 @@ var (
// This is a gate to prevent CVO from installing these operators which is conflicting
// with already owned resources by tectonic-operators.
// This files can be dropped when the overrides list becomes empty.
// IMPORTANT: You must also edit LegacyCVOOverrides
CVOOverrides = template.Must(template.New("cvo-override.yaml").Parse(`
apiVersion: config.openshift.io/v1
kind: ClusterVersion
metadata:
namespace: openshift-cluster-version
name: cluster-version-operator
spec:
upstream: http://localhost:8080/graph
channel: fast
clusterID: {{.CVOClusterID}}
overrides:
- kind: Deployment # this conflicts with kube-core-operator
namespace: openshift-cluster-network-operator
name: cluster-network-operator
unmanaged: true
- kind: ServiceAccount # missing run level 0 on the namespace and has 0000_08
namespace: openshift-cluster-dns-operator
name: cluster-dns-operator
unmanaged: true
- kind: Deployment # this conflicts with kube-core-operator
namespace: openshift-cluster-dns-operator
name: cluster-dns-operator
unmanaged: true
- kind: APIService # packages.apps.redhat.com fails to start properly
name: v1alpha1.packages.apps.redhat.com
unmanaged: true
`))

// LegacyCVOOverrides is the constant to represent contents of legacy-cvo-override.yaml file
// This is a gate to prevent CVO from installing these operators which is conflicting
// with already owned resources by tectonic-operators.
// This files can be dropped when the overrides list becomes empty.
LegacyCVOOverrides = template.Must(template.New("cvo-override.yaml").Parse(`
apiVersion: clusterversion.openshift.io/v1
kind: CVOConfig
metadata:
Expand Down
1 change: 1 addition & 0 deletions pkg/asset/manifests/operators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
"pull.json": applyTemplateData(bootkube.Pull, templateData),
"tectonic-network-operator.yaml": applyTemplateData(bootkube.TectonicNetworkOperator, templateData),
"cvo-overrides.yaml": applyTemplateData(bootkube.CVOOverrides, templateData),
"legacy-cvo-overrides.yaml": applyTemplateData(bootkube.LegacyCVOOverrides, templateData),
"etcd-service-endpoints.yaml": applyTemplateData(bootkube.EtcdServiceEndpointsKubeSystem, templateData),
"kube-system-secret-etcd-client.yaml": applyTemplateData(bootkube.KubeSystemSecretEtcdClient, templateData),

Expand Down