diff --git a/config/clusters/2i2c/support.values.yaml b/config/clusters/2i2c/support.values.yaml index 066aade30a..8cd4d4ac48 100644 --- a/config/clusters/2i2c/support.values.yaml +++ b/config/clusters/2i2c/support.values.yaml @@ -1,7 +1,6 @@ prometheusAuth: enabled: true - prometheus: server: ingress: diff --git a/deployer/cluster.py b/deployer/cluster.py index e4c1c8cd0d..3c35ca357c 100644 --- a/deployer/cluster.py +++ b/deployer/cluster.py @@ -114,10 +114,11 @@ def deploy_support(self): support_dir = (Path(__file__).parent.parent).joinpath("helm-charts", "support") # subprocess.check_call(["helm", "dep", "up", support_dir]) - # contains both encrypted and unencrypted values files - values_file_paths = [ - support_dir.joinpath("enc-support.secret.yaml") - ] + [self.config_path.joinpath(p) for p in self.support['helm_chart_values_files']] + # contains both encrypted and unencrypted values files + values_file_paths = [support_dir.joinpath("enc-support.secret.yaml")] + [ + self.config_path.joinpath(p) + for p in self.support["helm_chart_values_files"] + ] with get_decrypted_files(values_file_paths) as values_files: cmd = [ diff --git a/deployer/file_acquisition.py b/deployer/file_acquisition.py index bf9dc35412..4a846b4a64 100644 --- a/deployer/file_acquisition.py +++ b/deployer/file_acquisition.py @@ -157,6 +157,4 @@ def get_decrypted_files(files): files should be all absolute paths """ with ExitStack() as stack: - yield [ - stack.enter_context(get_decrypted_file(f)) for f in files - ] + yield [stack.enter_context(get_decrypted_file(f)) for f in files] diff --git a/deployer/hub.py b/deployer/hub.py index 21c830cc29..739a003078 100644 --- a/deployer/hub.py +++ b/deployer/hub.py @@ -223,7 +223,8 @@ def deploy(self, auth_provider, secret_key, skip_hub_health_test=False): with tempfile.NamedTemporaryFile( mode="w" ) as generated_values_file, get_decrypted_files( - self.cluster.config_path.joinpath(p) for p in self.spec["helm_chart_values_files"] + self.cluster.config_path.joinpath(p) + for p in self.spec["helm_chart_values_files"] ) as values_files: json.dump(generated_values, generated_values_file) generated_values_file.flush() diff --git a/helm-charts/support/values.schema.yaml b/helm-charts/support/values.schema.yaml index 1c73fa5d4c..3145d0c989 100644 --- a/helm-charts/support/values.schema.yaml +++ b/helm-charts/support/values.schema.yaml @@ -74,7 +74,7 @@ properties: type: object additionalProperties: false required: - - enabled + - enabled properties: enabled: type: boolean diff --git a/helm-charts/support/values.yaml b/helm-charts/support/values.yaml index e9c9fff3df..7d782cf114 100644 --- a/helm-charts/support/values.yaml +++ b/helm-charts/support/values.yaml @@ -33,7 +33,7 @@ prometheus: annotations: nginx.ingress.kubernetes.io/auth-type: basic nginx.ingress.kubernetes.io/auth-secret: prometheus-ingress-auth - nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required' + nginx.ingress.kubernetes.io/auth-realm: "Authentication Required" kubernetes.io/ingress.class: nginx cert-manager.io/cluster-issuer: letsencrypt-prod strategy: