Skip to content
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.

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

Updates the configMap name for Operator version #1536

Merged
merged 1 commit into from
Mar 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 pkg/cmd/version/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ func TestGetVersions(t *testing.T) {
chainsConfigMap := getConfigMapData("chains-info", "v0.8.0", map[string]string{"app.kubernetes.io/part-of": "tekton-chains"})
triggersConfigMap := getConfigMapData("triggers-info", "v0.5.0", map[string]string{"app.kubernetes.io/part-of": "tekton-pipelines"})
dashboardConfigMap := getConfigMapData("dashboard-info", "v0.7.0", map[string]string{"app.kubernetes.io/part-of": "tekton-pipelines"})
operatorConfigMap := getConfigMapData("operators-info", "v0.54.0", map[string]string{"app.kubernetes.io/part-of": "tekton-pipelines"})
operatorConfigMap := getConfigMapData("tekton-operator-info", "v0.54.0", map[string]string{"app.kubernetes.io/part-of": "tekton-pipelines"})

testParams := []struct {
name string
Expand Down
2 changes: 1 addition & 1 deletion pkg/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const (
pipelinesInfo string = "pipelines-info"
triggersInfo string = "triggers-info"
dashboardInfo string = "dashboard-info"
operatorInfo string = "operators-info"
operatorInfo string = "tekton-operator-info"
)

var defaultNamespaces = []string{"tekton-pipelines", "openshift-pipelines", "tekton-chains", "tekton-operator", "openshift-operators"}
Expand Down
4 changes: 2 additions & 2 deletions pkg/version/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -430,14 +430,14 @@ func TestGetOperatorVersionViaConfigMap(t *testing.T) {
{
name: "get operator version from configmap in tekton-pipelines namespace",
namespace: "tekton-pipelines",
configMap: getConfigMapData("operators-info", "main", map[string]string{"app.kubernetes.io/part-of": "tekton-pipelines"}),
configMap: getConfigMapData("tekton-operator-info", "main", map[string]string{"app.kubernetes.io/part-of": "tekton-pipelines"}),
want: "main",
},
{
name: "get operator version from configmap present in different namespace other than default namespaces",
namespace: "test",
userProvidedNamespace: "test",
configMap: getConfigMapData("operators-info", "test", map[string]string{"app.kubernetes.io/part-of": "tekton-pipelines"}),
configMap: getConfigMapData("tekton-operator-info", "test", map[string]string{"app.kubernetes.io/part-of": "tekton-pipelines"}),
want: "test",
},
}
Expand Down