Merge branch 'main' into hotfix-netpol

defenseunicorns · Dec 9, 2024 · 84497a0 · 84497a0
2 parents b78cae1 + 42d5bda
commit 84497a0
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml
@@ -41,7 +41,7 @@ runs:
       uses: defenseunicorns/lula-action/setup@badad8c4b1570095f57e66ffd62664847698a3b9 # v0.0.1
       with:
         # renovate: datasource=github-tags depName=defenseunicorns/lula versioning=semver-coerced
-        version: v0.12.0
+        version: v0.13.0
 
     - name: Iron Bank Login
       if: ${{ inputs.registry1Username != '' }}

diff --git a/src/loki/common/zarf.yaml b/src/loki/common/zarf.yaml
@@ -16,7 +16,7 @@ components:
         localPath: ../chart
       - name: loki
         url: https://grafana.github.io/helm-charts/
-        version: 6.19.0
+        version: 6.23.0
         namespace: loki
         valuesFiles:
           - ../values/values.yaml

diff --git a/src/loki/values/registry1-values.yaml b/src/loki/values/registry1-values.yaml
@@ -5,7 +5,7 @@ loki:
   image:
     registry: registry1.dso.mil
     repository: ironbank/opensource/grafana/loki
-    tag: 3.2.1
+    tag: 3.3.1
   podSecurityContext:
     fsGroup: 10001
     runAsGroup: 10001
@@ -26,4 +26,4 @@ gateway:
 memcached:
   image:
     repository: registry1.dso.mil/ironbank/opensource/memcached/memcached
-    tag: 1.6.32
+    tag: 1.6.33
diff --git a/src/loki/values/unicorn-values.yaml b/src/loki/values/unicorn-values.yaml
@@ -5,13 +5,13 @@ loki:
   image:
     registry: cgr.dev
     repository: du-uds-defenseunicorns/loki
-    tag: 3.2.1
+    tag: 3.3.1
 gateway:
   image:
     registry: cgr.dev
     repository: du-uds-defenseunicorns/nginx-fips
-    tag: 1.27.2
+    tag: 1.27.3
 memcached:
   image:
     repository: cgr.dev/du-uds-defenseunicorns/memcached
-    tag: 1.6.32
+    tag: 1.6.33
diff --git a/src/loki/values/upstream-values.yaml b/src/loki/values/upstream-values.yaml
@@ -5,7 +5,7 @@ loki:
   image:
     registry: docker.io
     repository: grafana/loki
-    tag: 3.2.1
+    tag: 3.3.1
 
 gateway:
   image:
@@ -17,4 +17,4 @@ memcached:
   image:
     registry: docker.io
     repository: memcached
-    tag: 1.6.32-alpine
+    tag: 1.6.33-alpine
diff --git a/src/loki/zarf.yaml b/src/loki/zarf.yaml
@@ -19,9 +19,9 @@ components:
         valuesFiles:
           - ./values/upstream-values.yaml
     images:
-      - docker.io/grafana/loki:3.2.1
+      - docker.io/grafana/loki:3.3.1
       - docker.io/nginxinc/nginx-unprivileged:1.27-alpine
-      - docker.io/memcached:1.6.32-alpine
+      - docker.io/memcached:1.6.33-alpine
 
   - name: loki
     required: true
@@ -35,9 +35,9 @@ components:
         valuesFiles:
           - ./values/registry1-values.yaml
     images:
-      - registry1.dso.mil/ironbank/opensource/grafana/loki:3.2.1
+      - registry1.dso.mil/ironbank/opensource/grafana/loki:3.3.1
       - registry1.dso.mil/ironbank/opensource/nginx/nginx-alpine:1.26.2
-      - registry1.dso.mil/ironbank/opensource/memcached/memcached:1.6.32
+      - registry1.dso.mil/ironbank/opensource/memcached/memcached:1.6.33
 
   - name: loki
     required: true
@@ -51,6 +51,6 @@ components:
         valuesFiles:
           - ./values/unicorn-values.yaml
     images:
-      - cgr.dev/du-uds-defenseunicorns/loki:3.2.1
-      - cgr.dev/du-uds-defenseunicorns/nginx-fips:1.27.2
-      - cgr.dev/du-uds-defenseunicorns/memcached:1.6.32
+      - cgr.dev/du-uds-defenseunicorns/loki:3.3.1
+      - cgr.dev/du-uds-defenseunicorns/nginx-fips:1.27.3
+      - cgr.dev/du-uds-defenseunicorns/memcached:1.6.33
diff --git a/tasks/create.yaml b/tasks/create.yaml
@@ -3,7 +3,7 @@
 
 
 includes:
-  - common: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.4.0/tasks/create.yaml
+  - common: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.0/tasks/create.yaml
 
 variables:
   - name: FLAVOR

diff --git a/tasks/lint.yaml b/tasks/lint.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
 
 includes:
-  - remote: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.4.0/tasks/lint.yaml
+  - remote: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.0/tasks/lint.yaml
 
 tasks:
   - name: fix

diff --git a/tasks/test.yaml b/tasks/test.yaml
@@ -9,7 +9,7 @@ includes:
   - base-layer: ../packages/base/tasks.yaml
   - idam-layer: ../packages/identity-authorization/tasks.yaml
   - common-setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/refs/tags/v0.13.1/tasks/setup.yaml
-  - compliance: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.4.0/tasks/compliance.yaml
+  - compliance: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.0/tasks/compliance.yaml
 
 tasks:
   - name: base