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.

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

bundle: do not reconcile ocs-client subscription #383

Closed
wants to merge 1 commit into from
Closed

bundle: do not reconcile ocs-client subscription #383

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
6 changes: 0 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,6 @@ OCS_SUBSCRIPTION_CHANNEL=$(OCS_SUBSCRIPTION_CHANNEL)
OCS_SUBSCRIPTION_STARTINGCSV=$(OCS_SUBSCRIPTION_STARTINGCSV)
OCS_SUBSCRIPTION_CATALOGSOURCE=$(OCS_SUBSCRIPTION_CATALOGSOURCE)
OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=$(OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE)
OCS_CLIENT_SUBSCRIPTION_NAME=$(OCS_CLIENT_SUBSCRIPTION_NAME)
OCS_CLIENT_SUBSCRIPTION_PACKAGE=$(OCS_CLIENT_SUBSCRIPTION_PACKAGE)
OCS_CLIENT_SUBSCRIPTION_CHANNEL=$(OCS_CLIENT_SUBSCRIPTION_CHANNEL)
OCS_CLIENT_SUBSCRIPTION_STARTINGCSV=$(OCS_CLIENT_SUBSCRIPTION_STARTINGCSV)
OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE=$(OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE)
OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=$(OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE)
IBM_SUBSCRIPTION_NAME=$(IBM_SUBSCRIPTION_NAME)
IBM_SUBSCRIPTION_PACKAGE=$(IBM_SUBSCRIPTION_PACKAGE)
IBM_SUBSCRIPTION_CHANNEL=$(IBM_SUBSCRIPTION_CHANNEL)
Expand Down
6 changes: 0 additions & 6 deletions bundle/manifests/odf-operator-manager-config_v1_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ data:
NOOBAA_SUBSCRIPTION_NAME: noobaa-operator
NOOBAA_SUBSCRIPTION_PACKAGE: noobaa-operator
NOOBAA_SUBSCRIPTION_STARTINGCSV: noobaa-operator.v5.14.0
OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
OCS_CLIENT_SUBSCRIPTION_CHANNEL: alpha
OCS_CLIENT_SUBSCRIPTION_NAME: ocs-client-operator
OCS_CLIENT_SUBSCRIPTION_PACKAGE: ocs-client-operator
OCS_CLIENT_SUBSCRIPTION_STARTINGCSV: ocs-client-operator.v4.15.0
OCS_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
OCS_SUBSCRIPTION_CHANNEL: alpha
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/odf-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ metadata:
categories: Storage
console.openshift.io/plugins: '["odf-console"]'
containerImage: quay.io/ocs-dev/odf-operator:latest
createdAt: "2024-03-22T02:45:54Z"
createdAt: "2024-03-22T16:17:33Z"
description: OpenShift Data Foundation provides a common control plane for storage
solutions on OpenShift Container Platform.
features.operators.openshift.io/token-auth-aws: "true"
Expand Down
6 changes: 0 additions & 6 deletions config/manager/manager.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ OCS_SUBSCRIPTION_CHANNEL=alpha
OCS_SUBSCRIPTION_STARTINGCSV=ocs-operator.v4.15.0
OCS_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
OCS_CLIENT_SUBSCRIPTION_NAME=ocs-client-operator
OCS_CLIENT_SUBSCRIPTION_PACKAGE=ocs-client-operator
OCS_CLIENT_SUBSCRIPTION_CHANNEL=alpha
OCS_CLIENT_SUBSCRIPTION_STARTINGCSV=ocs-client-operator.v4.15.0
OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
IBM_SUBSCRIPTION_NAME=ibm-storage-odf-operator
IBM_SUBSCRIPTION_PACKAGE=ibm-storage-odf-operator
IBM_SUBSCRIPTION_CHANNEL=stable-v1.4
Expand Down
14 changes: 0 additions & 14 deletions controllers/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,6 @@ var (
"OCS_SUBSCRIPTION_CATALOGSOURCE": "odf-catalogsource",
"OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-marketplace",

"OCS_CLIENT_SUBSCRIPTION_NAME": "ocs-client-operator",
"OCS_CLIENT_SUBSCRIPTION_PACKAGE": "ocs-client-operator",
"OCS_CLIENT_SUBSCRIPTION_CHANNEL": "alpha",
"OCS_CLIENT_SUBSCRIPTION_STARTINGCSV": "ocs-client-operator.v4.15.0",
"OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE": "odf-catalogsource",
"OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-marketplace",

"CSIADDONS_SUBSCRIPTION_NAME": "csi-addons",
"CSIADDONS_SUBSCRIPTION_PACKAGE": "csi-addons",
"CSIADDONS_SUBSCRIPTION_CHANNEL": "alpha",
Expand Down Expand Up @@ -83,13 +76,6 @@ var (
OcsSubscriptionCatalogSource = GetEnvOrDefault("OCS_SUBSCRIPTION_CATALOGSOURCE")
OcsSubscriptionCatalogSourceNamespace = GetEnvOrDefault("OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE")

OcsClientSubscriptionName = GetEnvOrDefault("OCS_CLIENT_SUBSCRIPTION_NAME")
OcsClientSubscriptionPackage = GetEnvOrDefault("OCS_CLIENT_SUBSCRIPTION_PACKAGE")
OcsClientSubscriptionChannel = GetEnvOrDefault("OCS_CLIENT_SUBSCRIPTION_CHANNEL")
OcsClientSubscriptionStartingCSV = GetEnvOrDefault("OCS_CLIENT_SUBSCRIPTION_STARTINGCSV")
OcsClientSubscriptionCatalogSource = GetEnvOrDefault("OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE")
OcsClientSubscriptionCatalogSourceNamespace = GetEnvOrDefault("OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE")

NoobaaSubscriptionName = GetEnvOrDefault("NOOBAA_SUBSCRIPTION_NAME")
NoobaaSubscriptionPackage = GetEnvOrDefault("NOOBAA_SUBSCRIPTION_PACKAGE")
NoobaaSubscriptionChannel = GetEnvOrDefault("NOOBAA_SUBSCRIPTION_CHANNEL")
Expand Down
19 changes: 2 additions & 17 deletions controllers/subscriptions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ func GetVendorCsvNames(kind odfv1alpha1.StorageKind) []string {
csvNames = []string{IbmSubscriptionStartingCSV}
} else if kind == VendorStorageCluster() {
csvNames = []string{OcsSubscriptionStartingCSV, RookSubscriptionStartingCSV, NoobaaSubscriptionStartingCSV,
CSIAddonsSubscriptionStartingCSV, OcsClientSubscriptionStartingCSV, PrometheusSubscriptionStartingCSV}
CSIAddonsSubscriptionStartingCSV, PrometheusSubscriptionStartingCSV}
}

return csvNames
Expand Down Expand Up @@ -361,21 +361,6 @@ func GetStorageClusterSubscriptions() []*operatorv1alpha1.Subscription {
},
}

ocsClientSubscription := &operatorv1alpha1.Subscription{
ObjectMeta: metav1.ObjectMeta{
Name: OcsClientSubscriptionName,
Namespace: OperatorNamespace,
},
Spec: &operatorv1alpha1.SubscriptionSpec{
CatalogSource: OcsClientSubscriptionCatalogSource,
CatalogSourceNamespace: OcsClientSubscriptionCatalogSourceNamespace,
Package: OcsClientSubscriptionPackage,
Channel: OcsClientSubscriptionChannel,
StartingCSV: OcsClientSubscriptionStartingCSV,
InstallPlanApproval: operatorv1alpha1.ApprovalAutomatic,
},
}

csiAddonsSubscription := &operatorv1alpha1.Subscription{
ObjectMeta: metav1.ObjectMeta{
Name: CSIAddonsSubscriptionName,
Expand Down Expand Up @@ -432,7 +417,7 @@ func GetStorageClusterSubscriptions() []*operatorv1alpha1.Subscription {
}

return []*operatorv1alpha1.Subscription{ocsSubscription, rookSubscription, noobaaSubscription,
csiAddonsSubscription, ocsClientSubscription, prometheusSubscription}
csiAddonsSubscription, prometheusSubscription}
}

// GetFlashSystemClusterSubscription return subscription for FlashSystemCluster
Expand Down
Loading