Skip to content

Commit de1fddb

Browse files
committed
Install namespace/openshift-lightspeed only when TechPreview is enabled
I forgot to do this in #1382. The feature of creating proposals is [enabled only on TP clusters](https://github.com/openshift/cluster-version-operator/blob/fa129da3b3cba865873715ec88a0fafde98f6585/pkg/cvo/cvo.go#L1215-L1219). The namespace is only for testing that feature. Installing it only on TP clusters is to keep the damage away from any production clusters. The renaming of ConfigMap from `ota-advisory-prompt` to `cluster-update-advisory-prompt` is to avoid using an obsolete team name.
1 parent fa129da commit de1fddb

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

install/0000_00_cluster-version-operator_45_openshift-lightspeed_namespace.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ kind: Namespace
33
metadata:
44
name: openshift-lightspeed
55
annotations:
6-
kubernetes.io/description: This manifest is only for testing purpose and will be removed when its own operator becomes available on the cluster.
6+
kubernetes.io/description: This manifest is only for testing purpose and will be removed before 5.0 GA or figure out how to install the cluster-update-advisory-prompt ConfigMap on a cluster where the openshift-lightspeed Namespace is installed by the OLM-installed OpenShift Lightspeed operator.
77
include.release.openshift.io/self-managed-high-availability: "true"
88
workload.openshift.io/allowed: "management"
9+
release.openshift.io/feature-set: TechPreviewNoUpgrade

install/0000_00_cluster-version-operator_50_lightspeed-prompts.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v1
33
kind: ConfigMap
44
metadata:
5-
name: ota-advisory-prompt
5+
name: cluster-update-advisory-prompt
66
namespace: openshift-lightspeed
77
annotations:
88
include.release.openshift.io/self-managed-high-availability: "true"

pkg/proposal/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ type Config struct {
8585
func DefaultConfig() Config {
8686
return Config{
8787
Namespace: envOrDefault("LIGHTSPEED_PROPOSAL_NAMESPACE", "openshift-lightspeed"),
88-
PromptConfigMap: envOrDefault("LIGHTSPEED_PROMPT_CONFIGMAP", "ota-advisory-prompt"),
88+
PromptConfigMap: envOrDefault("LIGHTSPEED_PROMPT_CONFIGMAP", "cluster-update-advisory-prompt"),
8989
}
9090
}
9191

0 commit comments

Comments
 (0)