diff --git a/CHANGELOG.md b/CHANGELOG.md index 73659b0..e843c31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## v1.0.1 2019-08-14 +### Fixes +- Deleting a `SecretDefinition` hangs if the corresponding secret does not exist. +- Invalid metric names in README + +### Deprecates +- Unused prometheus metrics `secrets_manager_controller_update_secret_errors_total` and `secrets_manager_controller_last_updated` + ## v1.0.0 2019-07-29 Stable release diff --git a/Makefile b/Makefile index 4d08b13..eabe539 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DOCKER_REGISTRY ?= "registry.hub.docker.com" BINARY_NAME=secrets-manager -SECRETS_MANAGER_VERSION=v1.0.0 +SECRETS_MANAGER_VERSION=v1.0.1 GO111MODULE=on # Image URL to use all building/pushing image targets IMG = ${DOCKER_REGISTRY}/${BINARY_NAME}:${SECRETS_MANAGER_VERSION} diff --git a/README.md b/README.md index 5ea3ba4..be49707 100644 --- a/README.md +++ b/README.md @@ -100,11 +100,9 @@ To deploy it just run `kubectl apply -f secretdefinition-sample.yaml` |`secrets_manager_vault_max_token_ttl` | Gauge | `secrets-manager` max Vault token TTL | `"vault_address", "vault_engine", "vault_version", "vault_cluster_id", "vault_cluster_name"` | |`secrets_manager_vault_token_ttl` | Gauge | Vault token TTL | `"vault_address", "vault_engine", "vault_version", "vault_cluster_id", "vault_cluster_name"` | |`secrets_manager_vault_token_renewal_errors_total`| Counter | Vault token renewal errors counter | `"vault_address", "vault_engine", "vault_version", "vault_cluster_id", "vault_cluster_name", "vault_operation", "error"` | -|`secrets_manager_k8s_secret_read_errors_total`| Counter | Errors total count when reading a secret from Kubernetes | `"name", "namespace"` | -|`secrets_manager_k8s_secret_update_errors_total`| Counter | Error total count when updating (and also creating) a secret in Kubernetes | `"name", "namespace"` | -| `secrets_manager_secret_sync_errors_total`| Counter |Secrets synchronization total errors.|`"name", "namespace"`| -|`secrets_manager_secret_last_updated`| Gauge |The last update timestamp as a Unix time (the number of seconds elapsed since January 1, 1970 UTC)|`"name", "namespace"`| -|`secrets_manager_secret_last_sync_status`| Gauge |The result of the last sync of a secret. 1 = OK, 0 = Error|`"name", "namespace"`| +|`secrets_manager_controller_secret_read_errors_total`| Counter | Errors total count when reading a secret from Kubernetes | `"name", "namespace"` | +| `secrets_manager_controller_sync_errors_total`| Counter |Secrets synchronization total errors.|`"name", "namespace"`| +|`secrets_manager_controller_last_sync_status`| Gauge |The result of the last sync of a secret. 1 = OK, 0 = Error|`"name", "namespace"`| ## Getting Started with Vault diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml index 263d1c3..3b69d5b 100644 --- a/config/default/manager_image_patch.yaml +++ b/config/default/manager_image_patch.yaml @@ -8,5 +8,5 @@ spec: spec: containers: # Change the value of image field below to your controller image URL - - image: registry.hub.docker.com/secrets-manager:v1.0.0 + - image: registry.hub.docker.com/secrets-manager:v1.0.1 name: manager diff --git a/config/samples/secrets-manager.yaml b/config/samples/secrets-manager.yaml index 0506d2f..b807db5 100644 --- a/config/samples/secrets-manager.yaml +++ b/config/samples/secrets-manager.yaml @@ -129,7 +129,7 @@ spec: spec: serviceAccountName: secrets-manager containers: - - image: secrets-manager:v1.0.0-snapshot-1 + - image: secrets-manager:v1.0.1 imagePullPolicy: IfNotPresent name: secrets-manager args: diff --git a/controllers/metrics.go b/controllers/metrics.go index 326c03d..be7e7b4 100644 --- a/controllers/metrics.go +++ b/controllers/metrics.go @@ -16,13 +16,6 @@ var ( Help: "Errors total count when reading a secret from Kubernetes", }, []string{"namespace", "name"}) - secretUpdateErrorsTotal = promauto.NewCounterVec(prometheus.CounterOpts{ - Namespace: "secrets_manager", - Subsystem: "controller", - Name: "secret_update_errors_total", - Help: "Error total count when updating (and also creating) a secret in Kubernetes", - }, []string{"namespace", "name"}) - secretSyncErrorsTotal = promauto.NewCounterVec(prometheus.CounterOpts{ Namespace: "secrets_manager", Subsystem: "controller", @@ -30,13 +23,6 @@ var ( Help: "Secrets synchronization total errors.", }, []string{"namespace", "name"}) - secretLastUpdated = promauto.NewGaugeVec(prometheus.GaugeOpts{ - Namespace: "secrets_manager", - Subsystem: "controller", - Name: "last_updated", - Help: "The last update timestamp as a Unix time (the number of seconds elapsed since January 1, 1970 UTC)", - }, []string{"namespace", "name"}) - secretLastSyncStatus = promauto.NewGaugeVec(prometheus.GaugeOpts{ Namespace: "secrets_manager", Subsystem: "controller", @@ -48,8 +34,6 @@ var ( func init() { r := metrics.Registry r.MustRegister(secretReadErrorsTotal) - r.MustRegister(secretUpdateErrorsTotal) r.MustRegister(secretSyncErrorsTotal) - r.MustRegister(secretLastUpdated) r.MustRegister(secretLastSyncStatus) }