Register RestoreBatch CRD + Fix Makefile (#1331)

Signed-off-by: Emruz Hossain <emruz@appscode.com>
stashed · Apr 7, 2021 · 32bc9f8 · 32bc9f8
1 parent c42b3ae
commit 32bc9f8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -366,15 +366,18 @@ endif
 
 .PHONY: install
 install:
-	@cd ../installer;						\
-	helm install stash charts/stash --wait	\
-		--namespace=$(KUBE_NAMESPACE)		\
-		--set-file license=$(LICENSE_FILE)	\
-		--set operator.registry=$(REGISTRY)	\
-		--set operator.tag=$(TAG)			\
-		--set imagePullPolicy=IfNotPresent	\
-		$(IMAGE_PULL_SECRETS);				\
-	kubectl wait --for=condition=Available apiservice -l 'app.kubernetes.io/name=stash,app.kubernetes.io/instance=stash' --timeout=5m
+	@cd ../installer;						                \
+	helm dependency update charts/stash ;                   \
+	helm install stash charts/stash --wait	                \
+		--namespace=$(KUBE_NAMESPACE)		                \
+		--set features.community=true                       \
+		--set global.registry=$(REGISTRY)	                \
+		--set-file global.license=$(LICENSE_FILE)	        \
+		--set stash-community.operator.tag=$(TAG)			\
+		--set stash-community.imagePullPolicy=IfNotPresent	\
+		--set cleaner.registry=appscode                     \
+		$(IMAGE_PULL_SECRETS);				                \
+	kubectl wait --for=condition=Available apiservice -l 'app.kubernetes.io/name=stash-community,app.kubernetes.io/instance=stash' --timeout=5m
 
 .PHONY: uninstall
 uninstall:

diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -139,8 +139,9 @@ func (c *StashController) ensureCustomResourceDefinitions() error {
 		api.Repository{}.CustomResourceDefinition(),
 		api_v1beta1.BackupConfiguration{}.CustomResourceDefinition(),
 		api_v1beta1.BackupSession{}.CustomResourceDefinition(),
-		api_v1beta1.RestoreSession{}.CustomResourceDefinition(),
 		api_v1beta1.BackupBlueprint{}.CustomResourceDefinition(),
+		api_v1beta1.RestoreSession{}.CustomResourceDefinition(),
+		api_v1beta1.RestoreBatch{}.CustomResourceDefinition(),
 		api_v1beta1.Task{}.CustomResourceDefinition(),
 		api_v1beta1.Function{}.CustomResourceDefinition(),