Skip to content

Commit

Permalink
Rename operator to dockerregistry-operator
Browse files Browse the repository at this point in the history
  • Loading branch information
MichalKalke committed Apr 9, 2024
1 parent d454f71 commit a34beda
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
13 changes: 5 additions & 8 deletions components/operator/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ docker-push: ## Push docker image with the operator.

##@ Deployment
IGNORE_NOT_FOUND = false
OPERATOR_NAME = serverless-operator
OPERATOR_NAME = dockerregistry-operator

.PHONY: build-image-operator
build-image-operator: ## Build serverless operator from local sources on k3d
Expand All @@ -74,7 +74,7 @@ install-operator-k3d: build-image-operator ## Build and install serverless opera
docker tag $(OPERATOR_NAME) $(OPERATOR_NAME):$(HASH_TAG)

k3d image import $(OPERATOR_NAME):$(HASH_TAG) -c kyma
kubectl set image deployment serverless-operator -n kyma-system manager=$(OPERATOR_NAME):$(HASH_TAG)
kubectl set image deployment dockerregistry-operator -n kyma-system manager=$(OPERATOR_NAME):$(HASH_TAG)


.PHONY: install
Expand Down Expand Up @@ -107,9 +107,9 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
$(KUSTOMIZE) build $(CONFIG_OPERATOR) | kubectl delete --ignore-not-found=$(IGNORE_NOT_FOUND) -f -

.PHONY: render-manifest
render-manifest: manifests kustomize ## Render serverless-operator.yaml manifest with image from IMG env.
render-manifest: manifests kustomize ## Render dockerregistry-operator.yaml manifest with image from IMG env.
cd $(CONFIG_OPERATOR)/deployment && $(KUSTOMIZE) edit set image controller=${IMG}
$(KUSTOMIZE) build $(CONFIG_OPERATOR) > $(PROJECT_ROOT)/serverless-operator.yaml
$(KUSTOMIZE) build $(CONFIG_OPERATOR) > $(PROJECT_ROOT)/dockerregistry-operator.yaml


.PHONY: apply-default-serverless-cr
Expand All @@ -130,10 +130,7 @@ check-serverless-installation: ## Wait for Serverless CR to be in Ready state.
./hack/verify_dockerregistry_status.sh || \
(make print-serverless-details && false)

kubectl wait --for condition=Available -n kyma-system deployment serverless-operator --timeout=60s || \
(make print-serverless-details && false)

kubectl wait --for condition=Available -n kyma-system deployment serverless-ctrl-mngr --timeout=60s || \
kubectl wait --for condition=Available -n kyma-system deployment dockerregistry-operator --timeout=60s || \
(make print-serverless-details && false)

.PHONY: print-serverless-details
Expand Down
2 changes: 1 addition & 1 deletion config/operator/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace: kyma-system
# "wordpress" becomes "alices-wordpress".
# Note that it should also match with the prefix (text before '-') of the namespace
# field above.
namePrefix: serverless-
namePrefix: dockerregistry-

# Labels to add to all resources and selectors.
commonLabels:
Expand Down

0 comments on commit a34beda

Please sign in to comment.