Merge branch 'main' into monitoring-layer

defenseunicorns · Oct 7, 2024 · c868234 · c868234
2 parents a095590 + 44f8ea5
commit c868234
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 33 deletions.
diff --git a/.github/actions/save-logs/action.yaml b/.github/actions/save-logs/action.yaml
@@ -34,7 +34,7 @@ runs:
         sudo chown $USER /tmp/uds-*.log || echo ""
       shell: bash
 
-    - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+    - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1
       with:
         name: debug-log${{ inputs.suffix }}
         path: |

diff --git a/.github/workflows/commitlint.yaml b/.github/workflows/commitlint.yaml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/compliance.yaml b/.github/workflows/compliance.yaml
@@ -28,7 +28,7 @@ jobs:
     steps:
       # Used to execute the uds run command
       - name: Checkout repository
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Environment setup
         uses: ./.github/actions/setup
@@ -66,7 +66,7 @@ jobs:
           ghToken: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload Evaluated Assessment
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1
         with:
           name: ${{ inputs.flavor }}-assessment-results
           path: ./compliance/oscal-assessment-results.yaml

diff --git a/.github/workflows/docs-shim.yaml b/.github/workflows/docs-shim.yaml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - name: lint-check
         uses: ./.github/actions/lint-check
 

diff --git a/.github/workflows/lint-oscal.yaml b/.github/workflows/lint-oscal.yaml
@@ -21,7 +21,7 @@ jobs:
       oscal_files: ${{ steps.path-filter.outputs.oscal_files }}
     steps:
       - name: Checkout the code
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       # Uses a custom action to filter paths for source packages.
       - name: Check src paths
@@ -48,7 +48,7 @@ jobs:
         shell: bash
       # checkout for access to the oscal files targeted for linting
       - name: Checkout the code
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - name: Environment setup
         uses: ./.github/actions/setup
       # lint the oscal files

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -23,7 +23,7 @@ jobs:
       id-token: write  # This is needed for OIDC federation.
 
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Environment setup
         uses: ./.github/actions/setup
@@ -107,7 +107,7 @@ jobs:
       id-token: write  # This is needed for OIDC federation.
 
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Environment setup
         uses: ./.github/actions/setup

diff --git a/.github/workflows/pull-request-conditionals.yaml b/.github/workflows/pull-request-conditionals.yaml
@@ -42,7 +42,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - name: lint-check
         uses: ./.github/actions/lint-check
 
@@ -56,7 +56,7 @@ jobs:
 
     steps:
       - name: Checkout the code
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       # Uses a custom action to filter paths for source packages.
       - name: Check src paths

diff --git a/.github/workflows/slim-dev-test.yaml b/.github/workflows/slim-dev-test.yaml
@@ -44,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - name: Environment setup
         uses: ./.github/actions/setup
       - name: Deploy Slim Dev Bundle

diff --git a/.github/workflows/snapshot-release.yaml b/.github/workflows/snapshot-release.yaml
@@ -24,7 +24,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           fetch-tags: 'true'
       - name: Update snapshot-latest tag

diff --git a/.github/workflows/test-eks.yaml b/.github/workflows/test-eks.yaml
@@ -33,7 +33,7 @@ jobs:
           echo "TF_VAR_permissions_boundary_name=${UDS_PERMISSIONS_BOUNDARY_NAME}" >> $GITHUB_ENV
 
       - name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -47,7 +47,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Environment setup
         uses: ./.github/actions/setup
@@ -71,7 +71,7 @@ jobs:
 
       - name: Upload Assessment
         if: ${{ inputs.package == 'all' && inputs.test_type == 'install' }}
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1
         with:
           name: ${{ inputs.flavor }}-assessment-results
           path: ./compliance/oscal-assessment-results.yaml

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

diff --git a/src/grafana/values/registry1-values.yaml b/src/grafana/values/registry1-values.yaml
@@ -1,7 +1,7 @@
 image:
   registry: registry1.dso.mil
   repository: ironbank/opensource/grafana/grafana
-  tag: 11.2.0
+  tag: 11.2.1
 
 initChownData:
   image:
@@ -18,4 +18,4 @@ sidecar:
   image:
     registry: registry1.dso.mil
     repository: ironbank/kiwigrid/k8s-sidecar
-    tag: 1.27.6
+    tag: 1.28.0
diff --git a/src/grafana/values/unicorn-values.yaml b/src/grafana/values/unicorn-values.yaml
@@ -1,13 +1,13 @@
 image:
   registry: cgr.dev
   repository: du-uds-defenseunicorns/grafana-fips
-  tag: 11.2.0
+  tag: 11.2.1
 
 initChownData:
   image:
     registry: cgr.dev
     repository: du-uds-defenseunicorns/busybox-fips
-    tag: 1.36.1
+    tag: 1.37.0
 
 downloadDashboardsImage:
   registry: cgr.dev
@@ -18,4 +18,4 @@ sidecar:
   image:
     registry: cgr.dev
     repository: du-uds-defenseunicorns/k8s-sidecar-fips
-    tag: 1.27.6
+    tag: 1.28.0
diff --git a/src/grafana/values/upstream-values.yaml b/src/grafana/values/upstream-values.yaml
@@ -3,18 +3,18 @@ sidecar:
     # -- The Docker registry
     registry: ghcr.io
     repository: kiwigrid/k8s-sidecar
-    tag: 1.27.6
+    tag: 1.28.0
 
 image:
   registry: docker.io
   repository: grafana/grafana
-  tag: 11.2.0
+  tag: 11.2.1
 
 initChownData:
   image:
     registry: docker.io
     repository: library/busybox
-    tag: 1.36.1
+    tag: 1.37.0
 
 downloadDashboardsImage:
   registry: docker.io

diff --git a/src/grafana/zarf.yaml b/src/grafana/zarf.yaml
@@ -21,10 +21,10 @@ components:
         valuesFiles:
           - values/upstream-values.yaml
     images:
-      - docker.io/grafana/grafana:11.2.0
+      - docker.io/grafana/grafana:11.2.1
       - docker.io/curlimages/curl:8.10.1
-      - docker.io/library/busybox:1.36.1
-      - ghcr.io/kiwigrid/k8s-sidecar:1.27.6
+      - docker.io/library/busybox:1.37.0
+      - ghcr.io/kiwigrid/k8s-sidecar:1.28.0
 
   - name: grafana
     required: true
@@ -37,9 +37,9 @@ components:
         valuesFiles:
           - values/registry1-values.yaml
     images:
-      - registry1.dso.mil/ironbank/opensource/grafana/grafana:11.2.0
+      - registry1.dso.mil/ironbank/opensource/grafana/grafana:11.2.1
       - registry1.dso.mil/ironbank/redhat/ubi/ubi9-minimal:9.4
-      - registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar:1.27.6
+      - registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar:1.28.0
 
   - name: grafana
     required: true
@@ -52,7 +52,7 @@ components:
         valuesFiles:
           - values/unicorn-values.yaml
     images:
-      - cgr.dev/du-uds-defenseunicorns/grafana-fips:11.2.0
-      - cgr.dev/du-uds-defenseunicorns/busybox-fips:1.36.1
+      - cgr.dev/du-uds-defenseunicorns/grafana-fips:11.2.1
+      - cgr.dev/du-uds-defenseunicorns/busybox-fips:1.37.0
       - cgr.dev/du-uds-defenseunicorns/curl-fips:8.10.1
-      - cgr.dev/du-uds-defenseunicorns/k8s-sidecar-fips:1.27.6
+      - cgr.dev/du-uds-defenseunicorns/k8s-sidecar-fips:1.28.0