From 52a868d7ed381269bd276ef3a7a2466f0d1bb2ad Mon Sep 17 00:00:00 2001 From: Calin Don Date: Wed, 22 Dec 2021 23:34:00 +0200 Subject: [PATCH] Fix the app version in the published Helm charts --- Changelog.md => CHANGELOG.md | 6 ++++++ Makefile | 6 +++--- deploy/charts/mysql-operator/README.md | 2 +- .../crds/mysql.presslabs.org_mysqlbackups.yaml | 2 +- .../crds/mysql.presslabs.org_mysqlclusters.yaml | 2 +- .../crds/mysql.presslabs.org_mysqldatabases.yaml | 2 +- .../mysql-operator/crds/mysql.presslabs.org_mysqlusers.yaml | 2 +- 7 files changed, 14 insertions(+), 8 deletions(-) rename Changelog.md => CHANGELOG.md (99%) diff --git a/Changelog.md b/CHANGELOG.md similarity index 99% rename from Changelog.md rename to CHANGELOG.md index 74e3bc98b..f74dbc668 100644 --- a/Changelog.md +++ b/CHANGELOG.md @@ -10,6 +10,12 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Removed ### Fixed +## [0.6.1] - 2021-12-22 +### Changed + * Bump https://github.com/bitpoke/build to 0.7.1 +### Fixed + * Fix the app version in the published Helm charts + ## [0.6.0] - 2021-12-21 ### Added * If you want to save mysql backup to AWS S3, `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` were the only options, but now you can use `AWS_SESSION_TOKEN` or `AWS_ROLE_ARN` and `AWS_WEB_IDENTITY_TOKEN_FILE` diff --git a/Makefile b/Makefile index a6ffd37eb..5db5d75ab 100644 --- a/Makefile +++ b/Makefile @@ -60,9 +60,9 @@ include build/makelib/helm.mk @set -e; \ for crd in $(wildcard $(CRD_DIR)/*.yaml) ; do \ cp $${crd} $(HELM_CHARTS_DIR)/mysql-operator/crds/ ; \ - $(YQ) e '.metadata.labels["app"]="mysql-operator"' -i $(HELM_CHARTS_DIR)/mysql-operator/crds/$$(basename $${crd}) ; \ - $(YQ) e 'del(.metadata.creationTimestamp)' -i $(HELM_CHARTS_DIR)/mysql-operator/crds/$$(basename $${crd}) ; \ - $(YQ) e 'del(.status)' -i $(HELM_CHARTS_DIR)/mysql-operator/crds/$$(basename $${crd}) ; \ + $(YQ) e '.metadata.labels["app.kubernetes.io/name"]="mysql-operator"' -i $(HELM_CHARTS_DIR)/mysql-operator/crds/$$(basename $${crd}) ; \ + $(YQ) e 'del(.metadata.creationTimestamp)' -i $(HELM_CHARTS_DIR)/mysql-operator/crds/$$(basename $${crd}) ; \ + $(YQ) e 'del(.status)' -i $(HELM_CHARTS_DIR)/mysql-operator/crds/$$(basename $${crd}) ; \ done @echo '{{- if .Values.rbac.create }}' > $(HELM_CHARTS_DIR)/mysql-operator/templates/clusterrole.yaml @echo 'apiVersion: rbac.authorization.k8s.io/v1' >> $(HELM_CHARTS_DIR)/mysql-operator/templates/clusterrole.yaml diff --git a/deploy/charts/mysql-operator/README.md b/deploy/charts/mysql-operator/README.md index fa61df3e1..6dfd0c9ce 100644 --- a/deploy/charts/mysql-operator/README.md +++ b/deploy/charts/mysql-operator/README.md @@ -1,4 +1,4 @@ -# mysql-operator +# Bitpoke MySQL Operator This is the helm chart for [mysql-operator](https://github.com/bitpoke/mysql-operator). diff --git a/deploy/charts/mysql-operator/crds/mysql.presslabs.org_mysqlbackups.yaml b/deploy/charts/mysql-operator/crds/mysql.presslabs.org_mysqlbackups.yaml index 4d34898dd..0b5cc05f6 100644 --- a/deploy/charts/mysql-operator/crds/mysql.presslabs.org_mysqlbackups.yaml +++ b/deploy/charts/mysql-operator/crds/mysql.presslabs.org_mysqlbackups.yaml @@ -5,7 +5,7 @@ metadata: controller-gen.kubebuilder.io/version: v0.7.0 name: mysqlbackups.mysql.presslabs.org labels: - app: mysql-operator + app.kubernetes.io/name: mysql-operator spec: group: mysql.presslabs.org names: diff --git a/deploy/charts/mysql-operator/crds/mysql.presslabs.org_mysqlclusters.yaml b/deploy/charts/mysql-operator/crds/mysql.presslabs.org_mysqlclusters.yaml index 9ba4f9063..626180a15 100644 --- a/deploy/charts/mysql-operator/crds/mysql.presslabs.org_mysqlclusters.yaml +++ b/deploy/charts/mysql-operator/crds/mysql.presslabs.org_mysqlclusters.yaml @@ -5,7 +5,7 @@ metadata: controller-gen.kubebuilder.io/version: v0.7.0 name: mysqlclusters.mysql.presslabs.org labels: - app: mysql-operator + app.kubernetes.io/name: mysql-operator spec: group: mysql.presslabs.org names: diff --git a/deploy/charts/mysql-operator/crds/mysql.presslabs.org_mysqldatabases.yaml b/deploy/charts/mysql-operator/crds/mysql.presslabs.org_mysqldatabases.yaml index a1f43b26d..6242d2512 100644 --- a/deploy/charts/mysql-operator/crds/mysql.presslabs.org_mysqldatabases.yaml +++ b/deploy/charts/mysql-operator/crds/mysql.presslabs.org_mysqldatabases.yaml @@ -5,7 +5,7 @@ metadata: controller-gen.kubebuilder.io/version: v0.7.0 name: mysqldatabases.mysql.presslabs.org labels: - app: mysql-operator + app.kubernetes.io/name: mysql-operator spec: group: mysql.presslabs.org names: diff --git a/deploy/charts/mysql-operator/crds/mysql.presslabs.org_mysqlusers.yaml b/deploy/charts/mysql-operator/crds/mysql.presslabs.org_mysqlusers.yaml index d62ff1432..70b3aa0e6 100644 --- a/deploy/charts/mysql-operator/crds/mysql.presslabs.org_mysqlusers.yaml +++ b/deploy/charts/mysql-operator/crds/mysql.presslabs.org_mysqlusers.yaml @@ -5,7 +5,7 @@ metadata: controller-gen.kubebuilder.io/version: v0.7.0 name: mysqlusers.mysql.presslabs.org labels: - app: mysql-operator + app.kubernetes.io/name: mysql-operator spec: group: mysql.presslabs.org names: