chore: small fixes (#209)

* Enable metrics-server component in core * Mount CA bundle in apps missing them
defenseunicorns · Oct 4, 2024 · 579b390 · 579b390
1 parent e00cf9d
commit 579b390
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 4 deletions.
diff --git a/bundles/eksd/uds-bundle.yaml b/bundles/eksd/uds-bundle.yaml
@@ -88,6 +88,8 @@ packages:
   - name: core
     repository: ghcr.io/defenseunicorns/packages/uds/core
     ref: 0.27.3-registry1
+    optionalComponents:
+      - metrics-server
     overrides:
       grafana:
         grafana:
@@ -556,6 +558,12 @@ packages:
               value: "###ZARF_VAR_SONARQUBE_DB_PASSWORD###"
             - path: "jdbcOverwrite.jdbcUsername"
               value: "###ZARF_VAR_SONARQUBE_DB_USERNAME###"
+        sonarqube:
+          values:
+            - path: extraVolumes
+              value: *extra-volumes
+            - path: extraVolumeMounts
+              value: *extra-volume-mounts
 
   - name: jira
     repository: ghcr.io/defenseunicorns/packages/uds/jira
@@ -571,6 +579,11 @@ packages:
             - path: postgres.password
               value: "###ZARF_VAR_JIRA_DB_PASSWORD###"
         jira:
+          values:
+            - path: volumes.additional
+              value: *extra-volumes
+            - path: jira.additionalVolumeMounts
+              value: *extra-volume-mounts
           variables:
             - name: JIRA_LOCAL_HOME_ENABLED
               path: "volumes.localHome.persistentVolumeClaim.create"
@@ -611,6 +624,13 @@ packages:
             - path: postgres.password
               value: "###ZARF_VAR_CONFLUENCE_DB_PASSWORD###"
         confluence:
+          values:
+            - path: additionalFiles
+              value:
+                - name: trust-bundle
+                  mountPath: /var/ssl
+                  key: "ca-bundle.jks"
+                  type: configMap
           variables:
             - name: CONFLUENCE_LOCAL_HOME_ENABLED
               path: "volumes.localHome.persistentVolumeClaim.create"
@@ -699,7 +719,7 @@ packages:
   # Nexus
   - name: nexus
     repository: ghcr.io/defenseunicorns/packages/uds/nexus
-    ref: 3.71.0-uds.1-registry1
+    ref: 3.72.0-uds.0-registry1
     overrides:
       nexus:
         nexus:

diff --git a/bundles/rke2/uds-bundle.yaml b/bundles/rke2/uds-bundle.yaml
@@ -86,6 +86,8 @@ packages:
   - name: core
     repository: ghcr.io/defenseunicorns/packages/uds/core
     ref: 0.27.3-registry1
+    optionalComponents:
+      - metrics-server
     overrides:
       grafana:
         grafana:
@@ -557,6 +559,16 @@ packages:
               value: "###ZARF_VAR_SONARQUBE_DB_PASSWORD###"
             - path: "jdbcOverwrite.jdbcUsername"
               value: "###ZARF_VAR_SONARQUBE_DB_USERNAME###"
+            - path: extraVolumes
+              value: *extra-volumes
+            - path: extraVolumeMounts
+              value: *extra-volume-mounts
+        sonarqube:
+          values:
+            - path: extraVolumes
+              value: *extra-volumes
+            - path: extraVolumeMounts
+              value: *extra-volume-mounts
 
   - name: jira
     repository: ghcr.io/defenseunicorns/packages/uds/jira
@@ -571,7 +583,16 @@ packages:
               value: "###ZARF_VAR_JIRA_DB_USERNAME###"
             - path: postgres.password
               value: "###ZARF_VAR_JIRA_DB_PASSWORD###"
+            - path: volumes.additional
+              value: *extra-volumes
+            - path: jira.additionalVolumeMounts
+              value: *extra-volume-mounts
         jira:
+          values:
+            - path: volumes.additional
+              value: *extra-volumes
+            - path: jira.additionalVolumeMounts
+              value: *extra-volume-mounts
           variables:
             - name: JIRA_LOCAL_HOME_ENABLED
               path: "volumes.localHome.persistentVolumeClaim.create"
@@ -611,7 +632,20 @@ packages:
               value: "###ZARF_VAR_CONFLUENCE_DB_USERNAME###"
             - path: postgres.password
               value: "###ZARF_VAR_CONFLUENCE_DB_PASSWORD###"
+            - path: additionalFiles
+              value:
+                - name: trust-bundle
+                  mountPath: /etc/pki/ca-trust/extracted/java/cacerts
+                  key: "ca-bundle.jks"
+                  type: configMap
         confluence:
+          values:
+            - path: additionalFiles
+              value:
+                - name: trust-bundle
+                  mountPath: /var/ssl
+                  key: "ca-bundle.jks"
+                  type: configMap
           variables:
             - name: CONFLUENCE_LOCAL_HOME_ENABLED
               path: "volumes.localHome.persistentVolumeClaim.create"
@@ -700,7 +734,7 @@ packages:
   # Nexus
   - name: nexus
     repository: ghcr.io/defenseunicorns/packages/uds/nexus
-    ref: 3.71.0-uds.1-registry1
+    ref: 3.72.0-uds.0-registry1
     overrides:
       nexus:
         nexus:

diff --git a/tasks/deploy.yaml b/tasks/deploy.yaml
@@ -33,7 +33,7 @@ tasks:
         default: "eksd"
         description: Input to specify the type of bundle to deploy
     actions:
-      - cmd: docker run --rm -e ARCH=${ARCH} -e BUNDLE_VERSION=${BUNDLE_VERSION} -e BUNDLE_TYPE=${INPUT_BUNDLE_TYPE} -e UDS_CONFIG=/configs/uds-config.yaml -e KUBECONFIG=/configs/kubeconfig -e PACKAGE_LIST="${INPUT_PACKAGE_LIST}" -v /tmp:/tmp -v ${INPUT_CONFIG_DIR}:/configs -v ${INPUT_BUILD_DIR}:/build ${DEPLOY_IMAGE} bash -c 'uds deploy /build/uds-bundle-software-factory-nutanix-${BUNDLE_TYPE}-${ARCH}-${BUNDLE_VERSION}.tar.zst ${PACKAGE_LIST} --confirm'
+      - cmd: docker run --rm -e ARCH=${ARCH} -e BUNDLE_VERSION=${BUNDLE_VERSION} -e BUNDLE_TYPE=${INPUT_BUNDLE_TYPE} -e UDS_CONFIG=/configs/uds-config.yaml -e KUBECONFIG=/configs/kubeconfig -e PACKAGE_LIST="${INPUT_PACKAGE_LIST}" -v /tmp:/tmp -v ${INPUT_CONFIG_DIR}:/configs -v ${INPUT_BUILD_DIR}:/build ${DEPLOY_IMAGE} bash -c 'uds deploy /build/uds-bundle-software-factory-nutanix-${BUNDLE_TYPE}-${ARCH}-${BUNDLE_VERSION}.tar.zst ${PACKAGE_LIST} --no-progress --confirm'
 
   - name: deploy-published
     description: Deploy published oci of bundle from ghcr
@@ -48,4 +48,4 @@ tasks:
         default: "eksd"
         description: Input to specify the type of bundle to deploy
     actions:
-      - cmd: docker run --rm -e BUNDLE_VERSION=${BUNDLE_VERSION} -e BUNDLE_TYPE=${INPUT_BUNDLE_TYPE} -e UDS_CONFIG=/configs/uds-config.yaml -e KUBECONFIG=/configs/kubeconfig -e PACKAGE_LIST="${INPUT_PACKAGE_LIST}" -v /tmp:/tmp -v ${INPUT_CONFIG_DIR}:/configs ${DEPLOY_IMAGE} bash -c 'uds deploy oci://ghcr.io/defenseunicorns/uds-bundle/software-factory-nutanix-${BUNDLE_TYPE}:${BUNDLE_VERSION} ${PACKAGE_LIST} --confirm'
+      - cmd: docker run --rm -e BUNDLE_VERSION=${BUNDLE_VERSION} -e BUNDLE_TYPE=${INPUT_BUNDLE_TYPE} -e UDS_CONFIG=/configs/uds-config.yaml -e KUBECONFIG=/configs/kubeconfig -e PACKAGE_LIST="${INPUT_PACKAGE_LIST}" -v /tmp:/tmp -v ${INPUT_CONFIG_DIR}:/configs ${DEPLOY_IMAGE} bash -c 'uds deploy oci://ghcr.io/defenseunicorns/uds-bundle/software-factory-nutanix-${BUNDLE_TYPE}:${BUNDLE_VERSION} ${PACKAGE_LIST} --no-progress --confirm'