Skip to content

Commit 83b5481

Browse files
Remove all other methods of installation apart from 'make install'
Having multiple methods of installation is leading to confusion and inconsistency in the operator installation process. We had along with the make install, a catalog based installation method, deploy-with-olm yaml, and cluster-deploy tool as well. Having such many methods is confusing and creates difficulties in maintaining the operator. Hence, we are removing all the other methods of installation apart from the 'make install' method. We will maintain this single method of upstream installation going forward. Signed-off-by: Malay Kumar Parida <[email protected]>
1 parent 9026af3 commit 83b5481

16 files changed

+1
-516
lines changed

.github/workflows/docker-push.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,3 @@ jobs:
4848
4949
make operator-bundle
5050
docker push quay.io/$REGISTRY_NAMESPACE/ocs-operator-bundle:$IMAGE_TAG
51-
52-
make operator-catalog
53-
docker push quay.io/$REGISTRY_NAMESPACE/ocs-operator-catalog:$IMAGE_TAG

.github/workflows/ocs-operator-ci.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ jobs:
8888
- name: Verify ocs bundle changes
8989
run: make verify-operator-bundle
9090

91-
- name: Verify deployment YAML
92-
run: make verify-latest-deploy-yaml
93-
9491
code-spell:
9592
name: verify code spellings
9693
runs-on: ubuntu-latest

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,3 @@ _cache
5656
bin
5757

5858
tools/csv-merger/csv-merger
59-
tools/cluster-deploy/cluster-deploy

Dockerfile.catalog

Lines changed: 0 additions & 15 deletions
This file was deleted.

Makefile

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,8 @@ CONTROLLER_GEN=$(LOCALBIN)/controller-gen
1414
operator-bundle \
1515
verify-operator-bundle \
1616
gen-latest-csv \
17-
gen-latest-deploy-yaml \
1817
gen-latest-prometheus-rules-yamls \
19-
verify-latest-deploy-yaml \
2018
verify-latest-csv \
21-
cluster-deploy \
22-
cluster-clean \
2319
functest \
2420
shellcheck-test \
2521
golangci-lint \
@@ -64,14 +60,6 @@ gen-release-csv: operator-sdk manifests kustomize
6460
@echo "Generating unified CSV from sourced component-level operators"
6561
hack/generate-unified-csv.sh
6662

67-
gen-latest-deploy-yaml:
68-
@echo "Generating latest deployment yaml file"
69-
hack/gen-deployment-yaml.sh
70-
71-
verify-latest-deploy-yaml: gen-latest-deploy-yaml
72-
@echo "Verifying deployment yaml changes"
73-
hack/verify-latest-deploy-yaml.sh
74-
7563
verify-latest-csv: gen-latest-csv
7664
@echo "Verifying latest CSV"
7765
hack/verify-latest-csv.sh
@@ -84,22 +72,10 @@ operator-bundle: gen-latest-csv
8472
@echo "Building ocs operator bundle"
8573
hack/build-operator-bundle.sh
8674

87-
operator-catalog:
88-
@echo "Building ocs catalog image in file based catalog format"
89-
hack/build-operator-catalog.sh
90-
9175
clean:
9276
@echo "cleaning previous outputs"
9377
hack/clean.sh
9478

95-
cluster-deploy: cluster-clean
96-
@echo "Deploying ocs to cluster"
97-
hack/cluster-deploy.sh
98-
99-
cluster-clean:
100-
@echo "Removing ocs install from cluster"
101-
hack/cluster-clean.sh
102-
10379
build-functest:
10480
@echo "Building functional tests"
10581
hack/build-functest.sh
@@ -122,7 +98,7 @@ unit-test:
12298
@echo "Executing unit tests"
12399
hack/unit-test.sh
124100

125-
ocs-operator-ci: shellcheck-test golangci-lint unit-test verify-deps verify-generated verify-latest-csv verify-operator-bundle verify-latest-deploy-yaml
101+
ocs-operator-ci: shellcheck-test golangci-lint unit-test verify-deps verify-generated verify-latest-csv verify-operator-bundle
126102

127103
# Generate code
128104
generate: controller-gen

catalog/index.yaml

Lines changed: 0 additions & 43 deletions
This file was deleted.

deploy/deploy-with-olm.yaml

Lines changed: 0 additions & 83 deletions
This file was deleted.

docs/catalog-generation.md

Lines changed: 0 additions & 122 deletions
This file was deleted.

hack/build-operator-catalog.sh

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)