From 8ce5788844286426ac3518844aebe86db1319f21 Mon Sep 17 00:00:00 2001 From: ablanchard Date: Wed, 10 Jul 2024 16:17:02 -0700 Subject: [PATCH 1/2] disabling autoscaling for now --- bundles/uds-core-swf/uds-bundle.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/uds-core-swf/uds-bundle.yaml b/bundles/uds-core-swf/uds-bundle.yaml index 3993b4c0..c414638e 100644 --- a/bundles/uds-core-swf/uds-bundle.yaml +++ b/bundles/uds-core-swf/uds-bundle.yaml @@ -234,7 +234,7 @@ packages: - path: "devMode" value: "false" - path: "autoscaling.enabled" - value: "true" + value: "false" - path: "persistence.providers.enabled" value: "true" - path: "persistence.accessMode" From f6d04b809a98123fd2fa8d71560e841323250cff Mon Sep 17 00:00:00 2001 From: ablanchard Date: Wed, 10 Jul 2024 16:31:58 -0700 Subject: [PATCH 2/2] addressing PR comments --- bundles/uds-core-swf/uds-bundle.yaml | 17 ----------------- .../mattermost/ca-secret.yaml | 8 -------- packages/additional-manifests/zarf.yaml | 6 ------ tasks/deploy.yaml | 1 + 4 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 packages/additional-manifests/mattermost/ca-secret.yaml diff --git a/bundles/uds-core-swf/uds-bundle.yaml b/bundles/uds-core-swf/uds-bundle.yaml index c414638e..1e7165b2 100644 --- a/bundles/uds-core-swf/uds-bundle.yaml +++ b/bundles/uds-core-swf/uds-bundle.yaml @@ -74,18 +74,6 @@ packages: overrides: grafana: grafana: - # Remove if extra_volumes works - # values: - # - path: global.extraSecretMounts - # value: - # - name: additional-ca-certs - # # path from example configmap mount - # # mountPath: /etc/grafana/ssl/ - # # actual path for ubi9 - # mountPath: /etc/pki/tls/certs/ - # subpath: "ca-bundle.crt" - # secretName: ca-secret - # readOnly: true values: - path: extraVolumes value: *extra-volumes @@ -322,11 +310,6 @@ packages: - name: LOKI_S3_SECRET_ACCESS_KEY path: loki.storage.s3.secretAccessKey description: "The S3 Secret Access Key" - # Remove if extra_volumes works and S3 CA doesn't explicitly need set - # - name: LOKI_TLS_CERT_PATH - # path: loki.storage.s3.http_config.ca_file - # description: "CA chain to trust for connections S3 buckets" - # default: "/etc/ssl/certs/ca.crt" - name: LOKI_WRITE_REPLICAS path: write.replicas description: "Loki write replicas" diff --git a/packages/additional-manifests/mattermost/ca-secret.yaml b/packages/additional-manifests/mattermost/ca-secret.yaml deleted file mode 100644 index c5afdc87..00000000 --- a/packages/additional-manifests/mattermost/ca-secret.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: ca-secret - namespace: mattermost -type: kubernetes.io/opaque -data: - ca.crt: "###ZARF_VAR_ADDITIONAL_CA_CHAIN###" diff --git a/packages/additional-manifests/zarf.yaml b/packages/additional-manifests/zarf.yaml index 7d65234c..430065df 100644 --- a/packages/additional-manifests/zarf.yaml +++ b/packages/additional-manifests/zarf.yaml @@ -30,9 +30,3 @@ components: - pepr-policy-exemptions/nutanix-csi-exemptions.yaml - pepr-policy-exemptions/metallb-exemptions.yaml - pepr-policy-exemptions/gitlab-exemptions.yaml - # - name: mattermost-ca-secret - # required: true - # manifests: - # - name: mattermost-ca-secret - # files: - # - mattermost/ca-secret.yaml diff --git a/tasks/deploy.yaml b/tasks/deploy.yaml index 9483c05d..894cfd6a 100644 --- a/tasks/deploy.yaml +++ b/tasks/deploy.yaml @@ -7,6 +7,7 @@ variables: default: "ghcr.io/defenseunicorns/build-harness/build-harness:2.0.28" - name: BUNDLE_VERSION description: "Version of the bundle to deploy" + # TODO - add release-please support default: "0.2.16" tasks: