Skip to content
This repository has been archived by the owner on Dec 16, 2024. It is now read-only.

allow channel to be overridden #617

Merged
merged 1 commit into from
Oct 2, 2023
Merged

allow channel to be overridden #617

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 cmd/ocm/addon-manager/manifests/subscription.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: kuadrant-operator
namespace: kuadrant-system
spec:
channel: alpha
channel: {{.Channel}}
installPlanApproval: Automatic
name: kuadrant-operator
source: {{.CatalogSource}}
Expand Down
3 changes: 3 additions & 0 deletions cmd/ocm/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ func GetDefaultValues(cluster *clusterv1.ManagedCluster,
defaultIstioConfigMap := "istio"
defaultCatalog := "operatorhubio-catalog"
defaultCatalogNS := "olm"
defaultChannel := "alpha"

manifestConfig := struct {
IstioOperator string
Expand All @@ -45,13 +46,15 @@ func GetDefaultValues(cluster *clusterv1.ManagedCluster,
ClusterName string
CatalogSource string
CatalogSourceNS string
Channel string
}{
ClusterName: cluster.Name,
IstioOperator: defaultIstioOperator,
IstioConfigMapName: defaultIstioConfigMap,
IstioOperatorNamespace: defaultIstioOperatorNS,
CatalogSource: defaultCatalog,
CatalogSourceNS: defaultCatalogNS,
Channel: defaultChannel,
}

return addonfactory.StructToValues(manifestConfig), nil
Expand Down