[OKD only] update upstream URL and channel

Update CVO upstream setting from OCP Cincinnati to OKD's release-controller
openshift · Aug 12, 2020 · a71f424 · a71f424
1 parent 7ec307f
commit a71f424
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/data/data/manifests/bootkube/cvo-overrides.yaml.template b/data/data/manifests/bootkube/cvo-overrides.yaml.template
@@ -4,6 +4,11 @@ metadata:
   namespace: openshift-cluster-version
   name: version
 spec:
+{{- if .IsOKD }}
+  upstream: https://origin-release.svc.ci.openshift.org/graph
+  channel: stable-4
+{{- else }}
   upstream: https://api.openshift.com/api/upgrades_info/v1/graph
   channel: stable-4.6
+{{- end }}
   clusterID: {{.CVOClusterID}}
diff --git a/pkg/asset/manifests/operators.go b/pkg/asset/manifests/operators.go
@@ -190,6 +190,7 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
 		McsTLSKey:                  base64.StdEncoding.EncodeToString(mcsCertKey.Key()),
 		PullSecretBase64:           base64.StdEncoding.EncodeToString([]byte(installConfig.Config.PullSecret)),
 		RootCaCert:                 string(rootCA.Cert()),
+		IsOKD:                      installConfig.Config.IsOKD(),
 	}
 
 	files := []*asset.File{}

diff --git a/pkg/asset/manifests/template.go b/pkg/asset/manifests/template.go
@@ -75,6 +75,7 @@ type bootkubeTemplateData struct {
 	PullSecretBase64           string
 	RootCaCert                 string
 	WorkerIgnConfig            string
+	IsOKD                      bool
 }
 
 type baremetalTemplateData struct {

diff --git a/pkg/asset/releaseimage/default.go b/pkg/asset/releaseimage/default.go
@@ -20,7 +20,7 @@ import (
 
 var (
 	// defaultReleaseImageOriginal is the value served when defaultReleaseImagePadded is unmodified.
-	defaultReleaseImageOriginal = "registry.svc.ci.openshift.org/origin/release:4.5"
+	defaultReleaseImageOriginal = "registry.svc.ci.openshift.org/origin/release:4.6"
 	// defaultReleaseImagePadded may be replaced in the binary with a pull spec that overrides defaultReleaseImage as
 	// a null-terminated string within the allowed character length. This allows a distributor to override the payload
 	// location without having to rebuild the source.