Skip to content

Commit

Permalink
Merge branch 'main' into renovate/pepr
Browse files Browse the repository at this point in the history
  • Loading branch information
rjferguson21 authored Sep 16, 2024
2 parents 82921fc + f222ea3 commit fbcfa23
Show file tree
Hide file tree
Showing 19 changed files with 47 additions and 47 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ runs:
uses: defenseunicorns/lula-action/setup@badad8c4b1570095f57e66ffd62664847698a3b9 # v0.0.1
with:
# renovate: datasource=github-tags depName=defenseunicorns/lula versioning=semver-coerced
version: v0.6.0
version: v0.7.0

- name: Iron Bank Login
if: ${{ inputs.registry1Username != '' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/commitlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:

- name: Install commitlint
run: |
npm install --save-dev @commitlint/config-conventional@19.4.1
npm install --save-dev @commitlint/cli@19.4.1
npm install --save-dev @commitlint/config-conventional@19.5.0
npm install --save-dev @commitlint/cli@19.5.0
- name: Lint PR title
env:
Expand Down
4 changes: 2 additions & 2 deletions src/istio/common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ components:
charts:
- name: base
url: https://istio-release.storage.googleapis.com/charts
version: 1.23.0
version: 1.23.1
namespace: istio-system
- name: istiod
url: https://istio-release.storage.googleapis.com/charts
version: 1.23.0
version: 1.23.1
namespace: istio-system
valuesFiles:
- "../values/values.yaml"
Expand Down
6 changes: 3 additions & 3 deletions src/istio/values/registry1-values.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
pilot:
image: registry1.dso.mil/ironbank/tetrate/istio/pilot:1.23.0-tetratefips-v0
image: registry1.dso.mil/ironbank/tetrate/istio/pilot:1.23.1-tetratefips-v0
global:
proxy_init:
# renovate: image=registry1.dso.mil/ironbank/tetrate/istio/proxyv2
image: "###ZARF_REGISTRY###/ironbank/tetrate/istio/proxyv2:1.23.0-tetratefips-v0"
image: "###ZARF_REGISTRY###/ironbank/tetrate/istio/proxyv2:1.23.1-tetratefips-v0"
proxy:
# renovate: image=registry1.dso.mil/ironbank/tetrate/istio/proxyv2
image: "###ZARF_REGISTRY###/ironbank/tetrate/istio/proxyv2:1.23.0-tetratefips-v0"
image: "###ZARF_REGISTRY###/ironbank/tetrate/istio/proxyv2:1.23.1-tetratefips-v0"
6 changes: 3 additions & 3 deletions src/istio/values/unicorn-values.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
pilot:
image: "cgr.dev/du-uds-defenseunicorns/istio-pilot-fips:1.23.0"
image: "cgr.dev/du-uds-defenseunicorns/istio-pilot-fips:1.23.1"
global:
proxy_init:
# renovate: image=cgr.dev/du-uds-defenseunicorns/istio-proxy-fips
image: "###ZARF_REGISTRY###/du-uds-defenseunicorns/istio-proxy-fips:1.23.0"
image: "###ZARF_REGISTRY###/du-uds-defenseunicorns/istio-proxy-fips:1.23.1"
proxy:
# renovate: image=cgr.dev/du-uds-defenseunicorns/istio-proxy-fips
image: "###ZARF_REGISTRY###/du-uds-defenseunicorns/istio-proxy-fips:1.23.0"
image: "###ZARF_REGISTRY###/du-uds-defenseunicorns/istio-proxy-fips:1.23.1"
6 changes: 3 additions & 3 deletions src/istio/values/upstream-values.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
pilot:
image: "docker.io/istio/pilot:1.23.0-distroless"
image: "docker.io/istio/pilot:1.23.1-distroless"
global:
proxy_init:
# renovate: image=docker.io/istio/proxyv2
image: "###ZARF_REGISTRY###/istio/proxyv2:1.23.0-distroless"
image: "###ZARF_REGISTRY###/istio/proxyv2:1.23.1-distroless"
proxy:
# renovate: image=docker.io/istio/proxyv2
image: "###ZARF_REGISTRY###/istio/proxyv2:1.23.0-distroless"
image: "###ZARF_REGISTRY###/istio/proxyv2:1.23.1-distroless"
18 changes: 9 additions & 9 deletions src/istio/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ components:
valuesFiles:
- "values/upstream-values.yaml"
images:
- "docker.io/istio/pilot:1.23.0-distroless"
- "docker.io/istio/proxyv2:1.23.0-distroless"
- "docker.io/istio/pilot:1.23.1-distroless"
- "docker.io/istio/proxyv2:1.23.1-distroless"

- name: istio-controlplane
required: true
Expand All @@ -35,8 +35,8 @@ components:
valuesFiles:
- "values/registry1-values.yaml"
images:
- registry1.dso.mil/ironbank/tetrate/istio/proxyv2:1.23.0-tetratefips-v0
- registry1.dso.mil/ironbank/tetrate/istio/pilot:1.23.0-tetratefips-v0
- registry1.dso.mil/ironbank/tetrate/istio/proxyv2:1.23.1-tetratefips-v0
- registry1.dso.mil/ironbank/tetrate/istio/pilot:1.23.1-tetratefips-v0

- name: istio-controlplane
required: true
Expand All @@ -49,15 +49,15 @@ components:
valuesFiles:
- "values/unicorn-values.yaml"
images:
- cgr.dev/du-uds-defenseunicorns/istio-pilot-fips:1.23.0
- cgr.dev/du-uds-defenseunicorns/istio-proxy-fips:1.23.0
- cgr.dev/du-uds-defenseunicorns/istio-pilot-fips:1.23.1
- cgr.dev/du-uds-defenseunicorns/istio-proxy-fips:1.23.1

- name: istio-admin-gateway
required: true
charts:
- name: gateway
url: https://istio-release.storage.googleapis.com/charts
version: 1.23.0
version: 1.23.1
releaseName: admin-ingressgateway
namespace: istio-admin-gateway
- name: uds-istio-config
Expand All @@ -72,7 +72,7 @@ components:
charts:
- name: gateway
url: https://istio-release.storage.googleapis.com/charts
version: 1.23.0
version: 1.23.1
releaseName: tenant-ingressgateway
namespace: istio-tenant-gateway
- name: uds-istio-config
Expand All @@ -87,7 +87,7 @@ components:
charts:
- name: gateway
url: https://istio-release.storage.googleapis.com/charts
version: 1.23.0
version: 1.23.1
releaseName: passthrough-ingressgateway
namespace: istio-passthrough-gateway
- name: uds-istio-config
Expand Down
6 changes: 3 additions & 3 deletions src/neuvector/common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ components:
charts:
- name: crd
url: https://neuvector.github.io/neuvector-helm/
version: 2.7.8
version: 2.7.9
namespace: neuvector
gitPath: charts/crd
- name: uds-neuvector-config
Expand All @@ -20,14 +20,14 @@ components:
localPath: ../chart
- name: core
url: https://neuvector.github.io/neuvector-helm/
version: 2.7.8
version: 2.7.9
namespace: neuvector
gitPath: charts/core
valuesFiles:
- ../values/values.yaml
- name: monitor
url: https://neuvector.github.io/neuvector-helm/
version: 2.7.8
version: 2.7.9
namespace: neuvector
gitPath: charts/monitor
valuesFiles:
Expand Down
2 changes: 1 addition & 1 deletion src/neuvector/values/unicorn-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ cve:
image:
repository: du-uds-defenseunicorns/neuvector-updater-fips
# renovate: datasource=docker depName=cgr.dev/du-uds-defenseunicorns/neuvector-updater-fips versioning=docker
tag: 8.9.1-dev
tag: 8.10.0-dev
2 changes: 1 addition & 1 deletion src/neuvector/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,5 @@ components:
- cgr.dev/du-uds-defenseunicorns/neuvector-enforcer-fips:5.3.4
- cgr.dev/du-uds-defenseunicorns/neuvector-controller-fips:5.3.4
- docker.io/neuvector/scanner:latest
- cgr.dev/du-uds-defenseunicorns/neuvector-updater-fips:8.9.1-dev
- cgr.dev/du-uds-defenseunicorns/neuvector-updater-fips:8.10.0-dev
- cgr.dev/du-uds-defenseunicorns/neuvector-prometheus-exporter-fips:5.3.0
2 changes: 1 addition & 1 deletion src/prometheus-stack/common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ components:
- name: kube-prometheus-stack
namespace: monitoring
url: https://prometheus-community.github.io/helm-charts
version: 62.6.0
version: 62.7.0
valuesFiles:
- "../values/values.yaml"
actions:
Expand Down
4 changes: 2 additions & 2 deletions src/prometheus-stack/tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ tasks:
# - name: gen-crds
# actions:
# - description: Generate servicemonitor types
# cmd: "npx kubernetes-fluent-client crd https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.1/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml src/pepr/operator/crd/generated/prometheus"
# cmd: "npx kubernetes-fluent-client crd https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml src/pepr/operator/crd/generated/prometheus"
# - description: Generate podmonitor types
# cmd: "npx kubernetes-fluent-client crd https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.1/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml src/pepr/operator/crd/generated/prometheus"
# cmd: "npx kubernetes-fluent-client crd https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml src/pepr/operator/crd/generated/prometheus"
# - description: Pepr Format
# cmd: "npx pepr format"
4 changes: 2 additions & 2 deletions src/prometheus-stack/values/registry1-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ prometheusOperator:
image:
registry: registry1.dso.mil
repository: ironbank/opensource/prometheus-operator/prometheus-operator
tag: v0.76.1
tag: v0.76.2
prometheusConfigReloader:
image:
registry: registry1.dso.mil
repository: ironbank/opensource/prometheus-operator/prometheus-config-reloader
tag: v0.76.1
tag: v0.76.2
4 changes: 2 additions & 2 deletions src/prometheus-stack/values/unicorn-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ prometheusOperator:
image:
registry: cgr.dev
repository: du-uds-defenseunicorns/prometheus-operator-fips
tag: 0.76.1
tag: 0.76.2
prometheusConfigReloader:
image:
registry: cgr.dev
repository: du-uds-defenseunicorns/prometheus-config-reloader-fips
tag: 0.76.1
tag: 0.76.2
4 changes: 2 additions & 2 deletions src/prometheus-stack/values/upstream-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ prometheusOperator:
image:
registry: quay.io
repository: prometheus-operator/prometheus-operator
tag: v0.76.1
tag: v0.76.2
prometheusConfigReloader:
image:
registry: quay.io
repository: prometheus-operator/prometheus-config-reloader
tag: v0.76.1
tag: v0.76.2
12 changes: 6 additions & 6 deletions src/prometheus-stack/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ components:
- "values/upstream-values.yaml"
images:
- "quay.io/prometheus/node-exporter:v1.8.2"
- "quay.io/prometheus-operator/prometheus-operator:v0.76.1"
- "quay.io/prometheus-operator/prometheus-operator:v0.76.2"
- "registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.13.0"
- "quay.io/prometheus/alertmanager:v0.27.0"
- "quay.io/prometheus-operator/prometheus-config-reloader:v0.76.1"
- "quay.io/prometheus-operator/prometheus-config-reloader:v0.76.2"
- "quay.io/prometheus/prometheus:v2.54.1"
- "registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.4.3"

Expand All @@ -48,10 +48,10 @@ components:
- "values/registry1-values.yaml"
images:
- "registry1.dso.mil/ironbank/opensource/prometheus/node-exporter:v1.8.2"
- "registry1.dso.mil/ironbank/opensource/prometheus-operator/prometheus-operator:v0.76.1"
- "registry1.dso.mil/ironbank/opensource/prometheus-operator/prometheus-operator:v0.76.2"
- "registry1.dso.mil/ironbank/opensource/kubernetes/kube-state-metrics:v2.13.0"
- "registry1.dso.mil/ironbank/opensource/prometheus/alertmanager:v0.27.0"
- "registry1.dso.mil/ironbank/opensource/prometheus-operator/prometheus-config-reloader:v0.76.1"
- "registry1.dso.mil/ironbank/opensource/prometheus-operator/prometheus-config-reloader:v0.76.2"
- "registry1.dso.mil/ironbank/opensource/prometheus/prometheus:v2.54.1"
- "registry1.dso.mil/ironbank/opensource/ingress-nginx/kube-webhook-certgen:v1.4.3"

Expand All @@ -68,9 +68,9 @@ components:
- "values/unicorn-values.yaml"
images:
- "cgr.dev/du-uds-defenseunicorns/prometheus-node-exporter-fips:1.8.2"
- "cgr.dev/du-uds-defenseunicorns/prometheus-operator-fips:0.76.1"
- "cgr.dev/du-uds-defenseunicorns/prometheus-operator-fips:0.76.2"
- "cgr.dev/du-uds-defenseunicorns/kube-state-metrics-fips:2.13.0"
- "cgr.dev/du-uds-defenseunicorns/prometheus-alertmanager-fips:0.27.0"
- "cgr.dev/du-uds-defenseunicorns/prometheus-config-reloader-fips:0.76.1"
- "cgr.dev/du-uds-defenseunicorns/prometheus-config-reloader-fips:0.76.2"
- "cgr.dev/du-uds-defenseunicorns/prometheus-fips:2.54.1"
- "cgr.dev/du-uds-defenseunicorns/kube-webhook-certgen-fips:1.11.2"
2 changes: 1 addition & 1 deletion src/velero/values/unicorn-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ image:
kubectl:
image:
repository: cgr.dev/du-uds-defenseunicorns/kubectl-fips
tag: 1.31.0-dev
tag: 1.31.1-dev

initContainers:
- name: velero-plugin-for-aws
Expand Down
2 changes: 1 addition & 1 deletion src/velero/values/upstream-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ image:
kubectl:
image:
repository: docker.io/bitnami/kubectl
tag: 1.31.0
tag: 1.31.1

initContainers:
- name: velero-plugin-for-aws
Expand Down
4 changes: 2 additions & 2 deletions src/velero/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ components:
images:
- velero/velero:v1.14.1
- velero/velero-plugin-for-aws:v1.10.1
- docker.io/bitnami/kubectl:1.31.0
- docker.io/bitnami/kubectl:1.31.1
- velero/velero-plugin-for-microsoft-azure:v1.10.1

- name: velero
Expand Down Expand Up @@ -50,5 +50,5 @@ components:
images:
- cgr.dev/du-uds-defenseunicorns/velero-fips:1.14.1-dev
- cgr.dev/du-uds-defenseunicorns/velero-plugin-for-aws-fips:1.10.1
- cgr.dev/du-uds-defenseunicorns/kubectl-fips:1.31.0-dev
- cgr.dev/du-uds-defenseunicorns/kubectl-fips:1.31.1-dev
- velero/velero-plugin-for-microsoft-azure:v1.10.1

0 comments on commit fbcfa23

Please sign in to comment.