Merge pull request #33 from denis-ryzhkov/revert-naming-suggestion

Revert "Applied helm values naming convention"
k0rdent · Jan 16, 2025 · 4c809f0 · 4c809f0
2 parents 787404e + 8507008
commit 4c809f0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -105,7 +105,7 @@ dev-storage-deploy: dev ## Deploy kof-storage helm chart to the K8s cluster spec
 dev-ms-deploy-aws: dev ## Deploy Mothership helm chart to the K8s cluster specified in ~/.kube/config for a remote storage cluster
 	cp -f $(TEMPLATES_DIR)/kof-mothership/values.yaml dev/mothership-values.yaml
 	@$(YQ) eval -i '.kcm.installTemplates = true' dev/mothership-values.yaml
-	@$(YQ) eval -i '.kcm.kof.clusterProfiles.kofAwsDnsSecrets = {"matchLabels": {"k0rdent.mirantis.com/kof-aws-dns-secrets": "true"}, "secrets": ["external-dns-aws-credentials"]}' dev/mothership-values.yaml
+	@$(YQ) eval -i '.kcm.kof.clusterProfiles.kof-aws-dns-secrets = {"matchLabels": {"k0rdent.mirantis.com/kof-aws-dns-secrets": "true"}, "secrets": ["external-dns-aws-credentials"]}' dev/mothership-values.yaml
 	@$(YQ) eval -i '.grafana.logSources = [{"name": "$(USER)-aws-storage", "url": "https://vmauth.$(STORAGE_DOMAIN)/vls", "type": "victoriametrics-logs-datasource", "auth": {"credentials_secret_name": "storage-vmuser-credentials", "username_key": "username", "password_key": "password"}}]' dev/mothership-values.yaml
 	@$(YQ) eval -i '.promxy.config.serverGroups = [{"clusterName": "$(USER)-aws-storage", "targets": ["vmauth.$(STORAGE_DOMAIN):443"], "auth": {"credentials_secret_name": "storage-vmuser-credentials", "create_secret": true, "username_key": "username", "password_key": "password"}}]' dev/mothership-values.yaml
 

diff --git a/charts/kof-mothership/Chart.yaml b/charts/kof-mothership/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: kof-mothership
 description: A Helm chart that deploys Grafana, Promxy, and VictoriaMetrics.
-version: 0.1.9
+version: 0.1.10
 appVersion: "1.0"
 dependencies:
   - name: grafana-operator

diff --git a/charts/kof-mothership/values.yaml b/charts/kof-mothership/values.yaml
@@ -21,7 +21,7 @@ kcm:
       storage:
         version: 0.1.4
     clusterProfiles:
-      kofStorageSecrets:
+      kof-storage-secrets:
         matchLabels:
           k0rdent.mirantis.com/kof-storage-secrets: "true"
         secrets:

diff --git a/charts/kof-storage/Chart.lock b/charts/kof-storage/Chart.lock
@@ -7,9 +7,9 @@ dependencies:
   version: 0.40.4
 - name: victoria-logs-single
   repository: https://victoriametrics.github.io/helm-charts/
-  version: 0.8.12
+  version: 0.8.13
 - name: external-dns
   repository: https://kubernetes-sigs.github.io/external-dns/
   version: 1.15.0
-digest: sha256:e4ba96403921fa721337ab6cb4a005fe205407c01badf77a91b7f9549dfb5737
-generated: "2025-01-13T15:11:53.857929+02:00"
+digest: sha256:9d2ba5ad9077958a76657e5907caa24ff7095bfc8c23a88c936a6e8fa9116076
+generated: "2025-01-16T18:49:52.244186+01:00"