Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ K8S_OPERATOR_NAMESPACE ?= rabbitmq-system
.PHONY: docker-registry-secret
docker-registry-secret:
$(call check_defined, DOCKER_REGISTRY_USERNAME, Username for accessing the docker registry)
$(call check_defined, DOCKER_REGISTRY_PASSWORD. Password for accessing the docker registry)
$(call check_defined, DOCKER_REGISTRY_PASSWORD, Password for accessing the docker registry)
$(call check_defined, DOCKER_REGISTRY_SECRET, Name of Kubernetes secret in which to store the Docker registry username and password)
$(call check_defined, DOCKER_REGISTRY_SERVER, URL of docker registry containing the Operator image (e.g. registry.my-company.com))
@echo "Creating registry secret and patching default service account"
Expand All @@ -235,7 +235,7 @@ destroy: ## Delete all resources of this Operator
.PHONY: deploy-dev
deploy-dev: cmctl docker-build-dev manifests deploy-rbac docker-registry-secret ## Build current code as a Docker image, push the image, and deploy to current Kubernetes context
$(call check_defined, DOCKER_REGISTRY_USERNAME, Username for accessing the docker registry)
$(call check_defined, DOCKER_REGISTRY_PASSWORD. Password for accessing the docker registry)
$(call check_defined, DOCKER_REGISTRY_PASSWORD, Password for accessing the docker registry)
$(call check_defined, DOCKER_REGISTRY_SECRET, Name of Kubernetes secret in which to store the Docker registry username and password)
$(call check_defined, DOCKER_REGISTRY_SERVER, URL of docker registry containing the Operator image (e.g. registry.my-company.com))
$(CMCTL) check api --wait=2m
Expand Down
4 changes: 2 additions & 2 deletions controllers/vhost_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ func (r *VhostReconciler) DeclareFunc(ctx context.Context, client rabbitmqclient
logger := ctrl.LoggerFrom(ctx)
vhost := obj.(*topology.Vhost)
settings := internal.GenerateVhostSettings(vhost)
logger.Info("generated vhost settings", "vhost", vhost.Spec.Name, "settings", settings)
logger.V(1).Info("generated vhost settings", "vhost", vhost.Spec.Name, "settings", settings)
err := validateResponse(client.PutVhost(vhost.Spec.Name, *settings))
if err != nil {
return err
}

newVhostLimits := internal.GenerateVhostLimits(vhost.Spec.VhostLimits)
logger.Info("getting existing vhost limits", vhost, vhost.Spec.Name)
logger.V(1).Info("getting existing vhost limits", "vhost", vhost.Spec.Name)
existingVhostLimits, err := r.getVhostLimits(client, vhost.Spec.Name)
if err != nil {
return err
Expand Down
Loading