|
1 | | -CR_KIND ?= Pulp |
2 | | -LOWER_CR_KIND = $(shell echo $(CR_KIND) | tr A-Z a-z) |
3 | | -CR_PLURAL ?= pulps |
4 | | -CR_DOMAIN ?= pulpproject.org |
5 | | -APP_IMAGE ?= quay.io/pulp/pulp-minimal |
6 | | -WEB_IMAGE ?= quay.io/pulp/pulp-web |
7 | | - |
8 | 1 | # VERSION defines the project version for the bundle. |
9 | 2 | # Update this value when you upgrade the version of your project. |
10 | 3 | # To re-generate a bundle for another specific version without changing the standard setup, you can: |
@@ -41,7 +34,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL) |
41 | 34 | # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both |
42 | 35 | # pulpproject.org/pulp-operator-bundle:$VERSION and pulpproject.org/pulp-operator-catalog:$VERSION. |
43 | 36 | #IMAGE_TAG_BASE ?= pulpproject.org/pulp-operator |
44 | | -IMAGE_TAG_BASE ?= quay.io/pulp/$(LOWER_CR_KIND)-operator |
| 37 | +IMAGE_TAG_BASE ?= quay.io/pulp/pulp-operator |
45 | 38 |
|
46 | 39 | # BUNDLE_IMG defines the image:tag used for the bundle. |
47 | 40 | # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>) |
|
60 | 53 |
|
61 | 54 | # Image URL to use all building/pushing image targets |
62 | 55 | IMG ?= $(IMAGE_TAG_BASE):v$(VERSION) |
63 | | -NAMESPACE ?= $(LOWER_CR_KIND)-operator-system |
| 56 | +NAMESPACE ?= pulp-operator-system |
64 | 57 | WATCH_NAMESPACE ?= $(NAMESPACE) |
65 | 58 |
|
66 | 59 | # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. |
@@ -115,9 +108,9 @@ help: ## Display this help. |
115 | 108 | .PHONY: manifests |
116 | 109 | manifests: tidy controller-gen crd-to-markdown ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. |
117 | 110 | $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases |
118 | | - $(CRD_MARKDOWN) -f apis/repo-manager.$(CR_DOMAIN)/v1/pulp_types.go -n $(CR_KIND) > controllers/repo_manager/README.md |
119 | | - $(CRD_MARKDOWN) -f apis/repo-manager.$(CR_DOMAIN)/v1/pulp_backup_types.go -n $(CR_KIND)Backup > controllers/backup/README.md |
120 | | - $(CRD_MARKDOWN) -f apis/repo-manager.$(CR_DOMAIN)/v1/pulp_restore_types.go -n $(CR_KIND)Restore > controllers/restore/README.md |
| 111 | + $(CRD_MARKDOWN) -f apis/repo-manager.pulpproject.org/v1/pulp_types.go -n Pulp > controllers/repo_manager/README.md |
| 112 | + $(CRD_MARKDOWN) -f apis/repo-manager.pulpproject.org/v1/pulp_backup_types.go -n PulpBackup > controllers/backup/README.md |
| 113 | + $(CRD_MARKDOWN) -f apis/repo-manager.pulpproject.org/v1/pulp_restore_types.go -n PulpRestore > controllers/restore/README.md |
121 | 114 |
|
122 | 115 | .PHONY: generate |
123 | 116 | generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations. |
@@ -216,7 +209,7 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified |
216 | 209 |
|
217 | 210 | .PHONY: local |
218 | 211 | local: kustomize ## Run controller in the K8s cluster specified in ~/.kube/config. |
219 | | - .ci/scripts/local.sh $(CR_KIND) $(CR_DOMAIN) $(CR_PLURAL) $(APP_IMAGE) $(WEB_IMAGE) |
| 212 | + .ci/scripts/local.sh Pulp pulpproject.org pulps quay.io/pulp/pulp-minimal quay.io/pulp/pulp-web |
220 | 213 |
|
221 | 214 | .PHONY: deploy |
222 | 215 | deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config. |
|
0 commit comments