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

add csi-addons sidecar #1

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

add csi-addons sidecar #1

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: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ NOOBAA_SUBSCRIPTION_CHANNEL=$(NOOBAA_SUBSCRIPTION_CHANNEL)
NOOBAA_SUBSCRIPTION_STARTINGCSV=$(NOOBAA_SUBSCRIPTION_STARTINGCSV)
NOOBAA_SUBSCRIPTION_CATALOGSOURCE=$(NOOBAA_SUBSCRIPTION_CATALOGSOURCE)
NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=$(NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE)
CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE=$(CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE)
CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=$(CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE)
CSI_ADDONS_SUBSCRIPTION_CHANNEL=$(CSI_ADDONS_SUBSCRIPTION_CHANNEL)
CSI_ADDONS_SUBSCRIPTION_NAME=$(CSI_ADDONS_SUBSCRIPTION_NAME)
CSI_ADDONS_SUBSCRIPTION_PACKAGE=$(CSI_ADDONS_SUBSCRIPTION_PACKAGE)
CSI_ADDONS_SUBSCRIPTION_STARTINGCSV=$(CSI_ADDONS_SUBSCRIPTION_STARTINGCSV)
OCS_SUBSCRIPTION_NAME=$(OCS_SUBSCRIPTION_NAME)
OCS_SUBSCRIPTION_PACKAGE=$(OCS_SUBSCRIPTION_PACKAGE)
OCS_SUBSCRIPTION_CHANNEL=$(OCS_SUBSCRIPTION_CHANNEL)
Expand Down
6 changes: 6 additions & 0 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
@@ -1,5 +1,11 @@
apiVersion: v1
data:
CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-storage
CSI_ADDONS_SUBSCRIPTION_CHANNEL: alpha
CSI_ADDONS_SUBSCRIPTION_NAME: csi-addons
CSI_ADDONS_SUBSCRIPTION_PACKAGE: csi-addons
CSI_ADDONS_SUBSCRIPTION_STARTINGCSV: csi-addons.latest
IBM_CSI_SUBSCRIPTION_STARTINGCSV: ibm-block-csi-operator.v1.6.0
IBM_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-storage
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 @@ -385,7 +385,7 @@ spec:
envFrom:
- configMapRef:
name: odf-operator-manager-config
image: quay.io/ocs-dev/odf-operator:latest
image: quay.io/ypadia/odf-operator:test
livenessProbe:
httpGet:
path: /healthz
Expand Down
4 changes: 4 additions & 0 deletions bundle/metadata/dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@ dependencies:
value:
packageName: ocs-operator
version: ">=4.8.0 <4.9.0 || 4.9.0"
- type: olm.package
value:
packageName: csi-addons
version: latest
4 changes: 2 additions & 2 deletions config/manager/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: quay.io/ocs-dev/odf-operator
newTag: latest
newName: quay.io/ypadia/odf-operator
newTag: test
6 changes: 6 additions & 0 deletions config/manager/manager.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ NOOBAA_SUBSCRIPTION_CHANNEL=alpha
NOOBAA_SUBSCRIPTION_STARTINGCSV=noobaa-operator.v5.9.0
NOOBAA_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-storage
CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-storage
CSI_ADDONS_SUBSCRIPTION_CHANNEL=alpha
CSI_ADDONS_SUBSCRIPTION_NAME=csi-addons
CSI_ADDONS_SUBSCRIPTION_PACKAGE=csi-addons
CSI_ADDONS_SUBSCRIPTION_STARTINGCSV=csi-addons.latest
OCS_SUBSCRIPTION_NAME=ocs-operator
OCS_SUBSCRIPTION_PACKAGE=ocs-operator
OCS_SUBSCRIPTION_CHANNEL=alpha
Expand Down
14 changes: 14 additions & 0 deletions controllers/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ var (
"OCS_SUBSCRIPTION_CATALOGSOURCE": "odf-catalogsource",
"OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-storage",

"CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE": "odf-catalogsource",
"CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-storage",
"CSI_ADDONS_SUBSCRIPTION_CHANNEL": "alpha",
"CSI_ADDONS_SUBSCRIPTION_NAME": "csi-addons",
"CSI_ADDONS_SUBSCRIPTION_PACKAGE": "csi-addons",
"CSI_ADDONS_SUBSCRIPTION_STARTINGCSV": "csi-addons.latest",

"IBM_SUBSCRIPTION_NAME": "ibm-storage-odf-operator",
"IBM_SUBSCRIPTION_PACKAGE": "ibm-storage-odf-operator",
"IBM_SUBSCRIPTION_CHANNEL": "stable-v1",
Expand Down Expand Up @@ -72,6 +79,13 @@ var (
NoobaaSubscriptionCatalogSource = GetEnvOrDefault("NOOBAA_SUBSCRIPTION_CATALOGSOURCE")
NoobaaSubscriptionCatalogSourceNamespace = GetEnvOrDefault("NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE")

CSIAddonsSubscriptionName = GetEnvOrDefault("CSI_ADDONS_SUBSCRIPTION_NAME")
CSIAddonsSubscriptionPackage = GetEnvOrDefault("CSI_ADDONS_SUBSCRIPTION_PACKAGE")
CSIAddonsSubscriptionChannel = GetEnvOrDefault("CSI_ADDONS_SUBSCRIPTION_CHANNEL")
CSIAddonsSubscriptionStartingCSV = GetEnvOrDefault("CSI_ADDONS_SUBSCRIPTION_STARTINGCSV")
CSIAddonsSubscriptionCatalogSource = GetEnvOrDefault("CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE")
CSIAddonsSubscriptionCatalogSourceNamespace = GetEnvOrDefault("CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE")

IbmSubscriptionName = GetEnvOrDefault("IBM_SUBSCRIPTION_NAME")
IbmSubscriptionPackage = GetEnvOrDefault("IBM_SUBSCRIPTION_PACKAGE")
IbmSubscriptionChannel = GetEnvOrDefault("IBM_SUBSCRIPTION_CHANNEL")
Expand Down
14 changes: 13 additions & 1 deletion hack/make-bundle-vars.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ NOOBAA_BUNDLE_IMG_TAG ?= v5.9.0
NOOBAA_BUNDLE_IMG_LOCATION ?= quay.io/noobaa
NOOBAA_BUNDLE_IMG ?= $(NOOBAA_BUNDLE_IMG_LOCATION)/$(NOOBAA_BUNDLE_IMG_NAME):$(NOOBAA_BUNDLE_IMG_TAG)

CSI_ADDONS_BUNDLE_IMG_TAG ?= latest
CSI_ADDONS_BUNDLE_IMG_LOCATION ?= quay.io/csiaddons/k8s-bundle
CSI_ADDONS_BUNDLE_IMG ?= $(CSI_ADDONS_BUNDLE_IMG_LOCATION):$(CSI_ADDONS_IMAGE_TAG)
CSI_ADDONS_BUNDLE_NAME ?= csi-addons

IBM_BUNDLE_NAME ?= ibm-storage-odf-operator
IBM_BUNDLE_IMG_NAME ?= $(IBM_BUNDLE_NAME)-bundle
IBM_BUNDLE_IMG_TAG ?= 1.0.0
Expand All @@ -78,7 +83,7 @@ ODF_CONSOLE_IMG ?= $(ODF_CONSOLE_IMG_LOCATION)/$(ODF_CONSOLE_IMG_NAME):$(ODF_CON

# A comma-separated list of bundle images (e.g. make catalog-build BUNDLE_IMGS=example.com/operator-bundle:v0.1.0,example.com/operator-bundle:v0.2.0).
# These images MUST exist in a registry and be pull-able.
BUNDLE_IMGS ?= $(shell echo $(BUNDLE_IMG) $(OCS_BUNDLE_IMG) $(IBM_BUNDLE_IMG) $(NOOBAA_BUNDLE_IMG) | sed "s/ /,/g")
BUNDLE_IMGS ?= $(shell echo $(BUNDLE_IMG) $(OCS_BUNDLE_IMG) $(IBM_BUNDLE_IMG) $(CSI_ADDONS_BUNDLE_IMG) $(NOOBAA_BUNDLE_IMG) | sed "s/ /,/g")

# Set CATALOG_BASE_IMG to an existing catalog image tag to add $BUNDLE_IMGS to that image.
ifneq ($(origin CATALOG_BASE_IMG), undefined)
Expand All @@ -99,6 +104,13 @@ NOOBAA_SUBSCRIPTION_STARTINGCSV ?= $(NOOBAA_BUNDLE_NAME).$(NOOBAA_BUNDLE_IMG_TAG
NOOBAA_SUBSCRIPTION_CATALOGSOURCE ?= $(OPERATOR_CATALOGSOURCE)
NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_NAMESPACE)

CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE ?= $(OPERATOR_CATALOGSOURCE)
CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_NAMESPACE)
CSI_ADDONS_SUBSCRIPTION_CHANNEL ?= $(DEFAULT_CHANNEL)
CSI_ADDONS_SUBSCRIPTION_NAME ?= $(CSI_ADDONS_BUNDLE_NAME)
CSI_ADDONS_SUBSCRIPTION_PACKAGE ?= $(CSI_ADDONS_BUNDLE_NAME)
CSI_ADDONS_SUBSCRIPTION_STARTINGCSV ?= $(CSI_ADDONS_BUNDLE_NAME).$(CSI_ADDONS_BUNDLE_IMG_TAG)

OCS_SUBSCRIPTION_NAME ?= $(OCS_BUNDLE_NAME)
OCS_SUBSCRIPTION_PACKAGE ?= $(OCS_BUNDLE_NAME)
OCS_SUBSCRIPTION_CHANNEL ?= $(DEFAULT_CHANNEL)
Expand Down