Skip to content

Commit 71ddd14

Browse files
committed
Fix logging error
The keys of the key-value fields for logger must be string type. We were passing the entire vhost object.
1 parent 342851f commit 71ddd14

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ K8S_OPERATOR_NAMESPACE ?= rabbitmq-system
207207
.PHONY: docker-registry-secret
208208
docker-registry-secret:
209209
$(call check_defined, DOCKER_REGISTRY_USERNAME, Username for accessing the docker registry)
210-
$(call check_defined, DOCKER_REGISTRY_PASSWORD. Password for accessing the docker registry)
210+
$(call check_defined, DOCKER_REGISTRY_PASSWORD, Password for accessing the docker registry)
211211
$(call check_defined, DOCKER_REGISTRY_SECRET, Name of Kubernetes secret in which to store the Docker registry username and password)
212212
$(call check_defined, DOCKER_REGISTRY_SERVER, URL of docker registry containing the Operator image (e.g. registry.my-company.com))
213213
@echo "Creating registry secret and patching default service account"
@@ -232,7 +232,7 @@ destroy: ## Delete all resources of this Operator
232232
.PHONY: deploy-dev
233233
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
234234
$(call check_defined, DOCKER_REGISTRY_USERNAME, Username for accessing the docker registry)
235-
$(call check_defined, DOCKER_REGISTRY_PASSWORD. Password for accessing the docker registry)
235+
$(call check_defined, DOCKER_REGISTRY_PASSWORD, Password for accessing the docker registry)
236236
$(call check_defined, DOCKER_REGISTRY_SECRET, Name of Kubernetes secret in which to store the Docker registry username and password)
237237
$(call check_defined, DOCKER_REGISTRY_SERVER, URL of docker registry containing the Operator image (e.g. registry.my-company.com))
238238
$(CMCTL) check api --wait=2m

controllers/vhost_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ func (r *VhostReconciler) DeclareFunc(ctx context.Context, client rabbitmqclient
2525
logger := ctrl.LoggerFrom(ctx)
2626
vhost := obj.(*topology.Vhost)
2727
settings := internal.GenerateVhostSettings(vhost)
28-
logger.Info("generated vhost settings", "vhost", vhost.Spec.Name, "settings", settings)
28+
logger.V(1).Info("generated vhost settings", "vhost", vhost.Spec.Name, "settings", settings)
2929
err := validateResponse(client.PutVhost(vhost.Spec.Name, *settings))
3030
if err != nil {
3131
return err
3232
}
3333

3434
newVhostLimits := internal.GenerateVhostLimits(vhost.Spec.VhostLimits)
35-
logger.Info("getting existing vhost limits", vhost, vhost.Spec.Name)
35+
logger.V(1).Info("getting existing vhost limits", "vhost", vhost.Spec.Name)
3636
existingVhostLimits, err := r.getVhostLimits(client, vhost.Spec.Name)
3737
if err != nil {
3838
return err

0 commit comments

Comments
 (0)