From 01d94e024eec015a19ec8dedc6f2102a84617434 Mon Sep 17 00:00:00 2001 From: roytman Date: Tue, 1 Mar 2022 12:24:41 +0000 Subject: [PATCH] Update charts Signed-off-by: GitHub --- charts/fybrik-crd/Chart.yaml | 6 +++--- charts/fybrik-crd/charts/asset-crd/Chart.yaml | 4 ++-- charts/fybrik/Chart.yaml | 4 ++-- charts/fybrik/kind-control.values.yaml | 1 + charts/fybrik/templates/cluster-metadata-config.yaml | 2 ++ charts/fybrik/templates/fybrik-config.yaml | 3 +++ charts/fybrik/templates/vault-credentials.yaml | 2 ++ charts/fybrik/values.yaml | 6 +++++- charts/vault/Chart.yaml | 2 +- 9 files changed, 21 insertions(+), 9 deletions(-) diff --git a/charts/fybrik-crd/Chart.yaml b/charts/fybrik-crd/Chart.yaml index f357590..cbbb73c 100644 --- a/charts/fybrik-crd/Chart.yaml +++ b/charts/fybrik-crd/Chart.yaml @@ -8,11 +8,11 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.6.2 +version: 0.6.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 0.6.2 +appVersion: 0.6.3 dependencies: - name: asset-crd - version: 0.6.2 + version: 0.6.3 condition: asset-crd.enabled diff --git a/charts/fybrik-crd/charts/asset-crd/Chart.yaml b/charts/fybrik-crd/charts/asset-crd/Chart.yaml index a10af49..a9076a0 100644 --- a/charts/fybrik-crd/charts/asset-crd/Chart.yaml +++ b/charts/fybrik-crd/charts/asset-crd/Chart.yaml @@ -16,8 +16,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.6.2 +version: 0.6.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 0.6.2 +appVersion: 0.6.3 diff --git a/charts/fybrik/Chart.yaml b/charts/fybrik/Chart.yaml index 74dc8fd..8069ff1 100644 --- a/charts/fybrik/Chart.yaml +++ b/charts/fybrik/Chart.yaml @@ -8,7 +8,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.6.2 +version: 0.6.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 0.6.2 +appVersion: 0.6.3 diff --git a/charts/fybrik/kind-control.values.yaml b/charts/fybrik/kind-control.values.yaml index e793255..8a3aad6 100644 --- a/charts/fybrik/kind-control.values.yaml +++ b/charts/fybrik/kind-control.values.yaml @@ -27,6 +27,7 @@ cluster: # Configuration when deploying to a coordinator cluster. coordinator: vault: + enabled: true # vault service in local setup is exposed via nodeport address: http://control-control-plane:31752 diff --git a/charts/fybrik/templates/cluster-metadata-config.yaml b/charts/fybrik/templates/cluster-metadata-config.yaml index fc39b27..baebeac 100644 --- a/charts/fybrik/templates/cluster-metadata-config.yaml +++ b/charts/fybrik/templates/cluster-metadata-config.yaml @@ -9,5 +9,7 @@ data: ClusterName: {{ required "cluster name must be set" .Values.cluster.name | quote }} Region: {{ required "cluster region must be set" .Values.cluster.region | quote }} Zone: {{ .Values.cluster.zone | quote }} + {{- if .Values.coordinator.vault.enabled }} VaultAuthPath: {{ required "vaultAuthPath must be set" .Values.cluster.vaultAuthPath | quote }} + {{- end }} {{- end }} diff --git a/charts/fybrik/templates/fybrik-config.yaml b/charts/fybrik/templates/fybrik-config.yaml index 9e73e9e..e342416 100644 --- a/charts/fybrik/templates/fybrik-config.yaml +++ b/charts/fybrik/templates/fybrik-config.yaml @@ -14,7 +14,10 @@ data: CATALOG_CONNECTOR_URL: {{ .Values.coordinator.catalogConnectorURL | default (printf "http://%s-connector:80" .Values.coordinator.catalog) | quote }} MAIN_POLICY_MANAGER_NAME: {{ .Values.coordinator.policyManager | quote }} MAIN_POLICY_MANAGER_CONNECTOR_URL: {{ .Values.coordinator.policyManagerConnectorURL | default (printf "http://%s-connector:80" .Values.coordinator.policyManager) | quote }} + {{- if .Values.coordinator.vault.enabled }} + VAULT_ENABLED: "true" VAULT_ADDRESS: {{ tpl .Values.coordinator.vault.address . | quote }} VAULT_MODULES_ROLE: "module" # temporary {{- end }} + {{- end }} {{- end }} diff --git a/charts/fybrik/templates/vault-credentials.yaml b/charts/fybrik/templates/vault-credentials.yaml index aca6165..2fb6ebf 100644 --- a/charts/fybrik/templates/vault-credentials.yaml +++ b/charts/fybrik/templates/vault-credentials.yaml @@ -1,4 +1,5 @@ {{- if include "fybrik.isEnabled" (tuple .Values.manager.enabled .Values.coordinator.enabled) }} +{{- if .Values.coordinator.vault.enabled }} apiVersion: v1 kind: Secret type: Opaque @@ -8,4 +9,5 @@ data: {{ if .Values.coordinator.vault.login.token }} VAULT_TOKEN: {{ .Values.coordinator.vault.login.token | b64enc }} {{ end }} +{{- end }} {{- end }} \ No newline at end of file diff --git a/charts/fybrik/values.yaml b/charts/fybrik/values.yaml index 5fc7b4f..020e1b2 100644 --- a/charts/fybrik/values.yaml +++ b/charts/fybrik/values.yaml @@ -79,7 +79,11 @@ coordinator: # Configure the vault instance to be used by the coordinator manager vault: - # Set to the Vault address. + # WARNING: it's an advanced feature, set it to "false" if all your modules and connectors do not require getting + # credentials from Fybrik. + # If it is "false", you can remove all other entries below. + enabled: true + # Set to the Vault address. address: "http://vault.{{ .Release.Namespace }}:8200" # Login method to Vault login: diff --git a/charts/vault/Chart.yaml b/charts/vault/Chart.yaml index 8f7b8b2..40a7237 100644 --- a/charts/vault/Chart.yaml +++ b/charts/vault/Chart.yaml @@ -8,7 +8,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.6.2 +version: 0.6.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. appVersion: 1.6.2