Merge branch 'main' into renovate/grafana

defenseunicorns · Dec 17, 2024 · 6db1ce1 · 6db1ce1
2 parents eb6033f + bde01da
commit 6db1ce1
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 18 deletions.
diff --git a/.github/workflows/test-aks.yaml b/.github/workflows/test-aks.yaml
@@ -1,12 +1,13 @@
 # Copyright 2024 Defense Unicorns
 # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
 
-name: AKS Nightly Test
+name: AKS Test
 
 on:
   schedule:
-    - cron: '0 6 * * *' # Runs at midnight Mountain every day
+    - cron: '0 0 * * 0' # Every Sunday Midnight (UTC) / Saturday 5pm MT
   pull_request:
+    types: [milestoned, opened, reopened, synchronize]
     paths:
       - tasks/iac.yaml
       - .github/bundles/aks/*

diff --git a/.github/workflows/test-eks.yaml b/.github/workflows/test-eks.yaml
@@ -1,12 +1,13 @@
 # Copyright 2024 Defense Unicorns
 # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
 
-name: EKS Nightly Test
+name: EKS Test
 
 on:
   schedule:
-    - cron: '0 6 * * *' # Runs at midnight Mountain every day
+    - cron: '0 0 * * 0' # Every Sunday Midnight (UTC) / Saturday 5pm MT
   pull_request:
+    types: [milestoned, opened, reopened, synchronize]
     paths:
       - tasks/iac.yaml
       - .github/bundles/eks/*

diff --git a/.github/workflows/test-rke2.yaml b/.github/workflows/test-rke2.yaml
@@ -1,12 +1,13 @@
 # Copyright 2024 Defense Unicorns
 # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
 
-name: RKE2 Nightly Test
+name: RKE2 Test
 
 on:
   schedule:
-    - cron: '0 6 * * *' # Runs at midnight Mountain every day
+    - cron: '0 0 * * 0' # Every Sunday Midnight (UTC) / Saturday 5pm MT
   pull_request:
+    types: [milestoned, opened, reopened, synchronize]
     paths:
       - tasks/iac.yaml
       - .github/bundles/rke2/*

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "k3d-setup": "k3d cluster delete pepr-dev && k3d cluster create pepr-dev --k3s-arg '--debug@server:0'"
   },
   "dependencies": {
-    "pepr": "0.42.0"
+    "pepr": "0.42.1"
   },
   "devDependencies": {
     "@jest/globals": "29.7.0",

diff --git a/src/keycloak/chart/values.yaml b/src/keycloak/chart/values.yaml
@@ -10,7 +10,7 @@ image:
   pullPolicy: IfNotPresent
 
 # renovate: datasource=github-tags depName=defenseunicorns/uds-identity-config versioning=semver
-configImage: ghcr.io/defenseunicorns/uds/identity-config:0.8.0
+configImage: ghcr.io/defenseunicorns/uds/identity-config:0.9.0
 
 # The public domain name of the Keycloak server
 domain: "###ZARF_VAR_DOMAIN###"

diff --git a/src/keycloak/tasks.yaml b/src/keycloak/tasks.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
 
 includes:
-  - config: https://raw.githubusercontent.com/defenseunicorns/uds-identity-config/v0.8.0/tasks.yaml
+  - config: https://raw.githubusercontent.com/defenseunicorns/uds-identity-config/v0.9.0/tasks.yaml
 
 tasks:
   - name: validate

diff --git a/src/keycloak/zarf.yaml b/src/keycloak/zarf.yaml
@@ -27,7 +27,7 @@ components:
           - "values/upstream-values.yaml"
     images:
       - quay.io/keycloak/keycloak:26.0.7
-      - ghcr.io/defenseunicorns/uds/identity-config:0.8.0
+      - ghcr.io/defenseunicorns/uds/identity-config:0.9.0
 
   - name: keycloak
     required: true
@@ -43,7 +43,7 @@ components:
           - "values/registry1-values.yaml"
     images:
       - registry1.dso.mil/ironbank/opensource/keycloak/keycloak:26.0.7
-      - ghcr.io/defenseunicorns/uds/identity-config:0.8.0
+      - ghcr.io/defenseunicorns/uds/identity-config:0.9.0
 
   - name: keycloak
     required: true
@@ -57,4 +57,4 @@ components:
           - "values/unicorn-values.yaml"
     images:
       - cgr.dev/du-uds-defenseunicorns/keycloak:26.0.7 # todo: switch to FIPS image
-      - ghcr.io/defenseunicorns/uds/identity-config:0.8.0
+      - ghcr.io/defenseunicorns/uds/identity-config:0.9.0
diff --git a/tasks/create.yaml b/tasks/create.yaml
@@ -11,7 +11,7 @@ variables:
 
   - name: REGISTRY1_PEPR_IMAGE
     # renovate: datasource=docker depName=registry1.dso.mil/ironbank/opensource/defenseunicorns/pepr/controller versioning=semver
-    default: registry1.dso.mil/ironbank/opensource/defenseunicorns/pepr/controller:v0.42.0
+    default: registry1.dso.mil/ironbank/opensource/defenseunicorns/pepr/controller:v0.42.1
 
   - name: LAYER
 

diff --git a/tasks/iac.yaml b/tasks/iac.yaml
@@ -115,7 +115,7 @@ tasks:
 
           # wait for cluster components
           while true; do
-            if [ $(uds zarf tools kubectl get po -A --no-headers=true | egrep -v 'Running|Completed' | wc -l) -gt 0 ]; then
+            if [ $(uds zarf tools kubectl get po,job -A --no-headers=true | egrep -v 'Running|Complete' | wc -l) -gt 0 ]; then
               echo "Waiting for cluster components to be ready...";
               sleep 5;
             else