From 6a6120998e0667d7c6bdf2d5c3bdcda595ecffca Mon Sep 17 00:00:00 2001
From: "mr.bot" <mr.bot@bigbang.dev>
Date: Wed, 26 Mar 2025 17:05:02 +0000
Subject: [PATCH 1/3] Updated vault git tag
---
chart/values.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/chart/values.yaml b/chart/values.yaml
index 7e9ade9fcd..ae9d5b5548 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1967,11 +1967,11 @@ addons:
git:
repo: https://repo1.dso.mil/big-bang/product/packages/vault.git
path: "./chart"
- tag: "0.29.1-bb.9"
+ tag: "0.29.1-bb.10"
helmRepo:
repoName: "registry1"
chartName: "vault"
- tag: "0.29.1-bb.9"
+ tag: "0.29.1-bb.10"
# -- Flux reconciliation overrides specifically for the Vault Package
flux: {}
--
GitLab
From 0c007ec7ab6a60a4a24559b000ab5aa2f7a853ca Mon Sep 17 00:00:00 2001
From: chukwuka akagbusi <chukwuka.akagbusi.ctr@us.af.mil>
Date: Thu, 27 Mar 2025 09:27:21 -0500
Subject: [PATCH 2/3] added networkpolicy templating for egress and ingress
---
chart/templates/vault/namespace.yaml | 2 +-
chart/templates/vault/values.yaml | 6 ++++--
docs/assets/scripts/developer/k3d_dev_run_batch755 | 2 ++
docs/assets/scripts/developer/k3d_dev_run_batchVt9 | 2 ++
4 files changed, 9 insertions(+), 3 deletions(-)
create mode 100644 docs/assets/scripts/developer/k3d_dev_run_batch755
create mode 100644 docs/assets/scripts/developer/k3d_dev_run_batchVt9
diff --git a/chart/templates/vault/namespace.yaml b/chart/templates/vault/namespace.yaml
index f0d0a8a9d1..4697308f32 100644
--- a/chart/templates/vault/namespace.yaml
+++ b/chart/templates/vault/namespace.yaml
@@ -7,5 +7,5 @@ metadata:
app.kubernetes.io/name: vault
app.kubernetes.io/component: "security-tools"
{{- include "commonLabels" . | nindent 4}}
- istio-injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.addons.vault) "enabled")) }}
+ istio-injection: {{ ternary "enabled" "disabled" (and (include "istioEnabled" .) (eq (dig "istio" "injection" "enabled" .Values.addons.vault) "enabled")) }}
{{- end }}
diff --git a/chart/templates/vault/values.yaml b/chart/templates/vault/values.yaml
index 78d408eefa..c94c7f81c9 100644
--- a/chart/templates/vault/values.yaml
+++ b/chart/templates/vault/values.yaml
@@ -54,6 +54,8 @@ csi:
networkPolicies:
enabled: {{ .Values.networkPolicies.enabled }}
+ istioNamespaceSelector:
+ {{ include "istioNamespaceSelector" . | nindent 4 }}
ingressLabels:
{{- $gateway := default "public" .Values.addons.vault.ingress.gateway }}
{{- $default := dict "app" (dig "gateways" $gateway "ingressGateway" nil .Values.istio) "istio" nil }}
@@ -63,7 +65,7 @@ networkPolicies:
vpcCidr: {{ .Values.networkPolicies.vpcCidr }}
istio:
- enabled: {{ .Values.istio.enabled }}
+ enabled: {{ include "istioEnabled" . }}
hardened:
enabled: {{ or
(dig "istio" "hardened" "enabled" false .Values.addons.vault.values)
@@ -71,7 +73,7 @@ istio:
}}
vault:
gateways:
- - istio-system/{{ default "public" .Values.addons.vault.ingress.gateway }}
+ - {{ include "istioGatewayNamespace" . }}/{{ default (include "istioPublicGateway" . ) .Values.addons.vault.ingress.gateway }}
{{- if and .Values.addons.vault.ingress.cert .Values.addons.vault.ingress.key }}
tls:
cert: {{ .Values.addons.vault.ingress.cert | quote }}
diff --git a/docs/assets/scripts/developer/k3d_dev_run_batch755 b/docs/assets/scripts/developer/k3d_dev_run_batch755
new file mode 100644
index 0000000000..aad20a05a4
--- /dev/null
+++ b/docs/assets/scripts/developer/k3d_dev_run_batch755
@@ -0,0 +1,2 @@
+#!/bin/bash
+set -xue
diff --git a/docs/assets/scripts/developer/k3d_dev_run_batchVt9 b/docs/assets/scripts/developer/k3d_dev_run_batchVt9
new file mode 100644
index 0000000000..aad20a05a4
--- /dev/null
+++ b/docs/assets/scripts/developer/k3d_dev_run_batchVt9
@@ -0,0 +1,2 @@
+#!/bin/bash
+set -xue
--
GitLab
From 50b233165a7f088773f9c939e15edc181ee03049 Mon Sep 17 00:00:00 2001
From: chukwuka akagbusi <chukwuka.akagbusi.ctr@us.af.mil>
Date: Fri, 28 Mar 2025 11:56:31 -0500
Subject: [PATCH 3/3] fix vault package namespace.yaml istio-injection
---
chart/templates/vault/namespace.yaml | 2 +-
docs/assets/scripts/developer/k3d_dev_run_batch12U | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
create mode 100644 docs/assets/scripts/developer/k3d_dev_run_batch12U
diff --git a/chart/templates/vault/namespace.yaml b/chart/templates/vault/namespace.yaml
index 4697308f32..9a97a6ef35 100644
--- a/chart/templates/vault/namespace.yaml
+++ b/chart/templates/vault/namespace.yaml
@@ -7,5 +7,5 @@ metadata:
app.kubernetes.io/name: vault
app.kubernetes.io/component: "security-tools"
{{- include "commonLabels" . | nindent 4}}
- istio-injection: {{ ternary "enabled" "disabled" (and (include "istioEnabled" .) (eq (dig "istio" "injection" "enabled" .Values.addons.vault) "enabled")) }}
+ istio-injection: {{ ternary "enabled" "disabled" (and (eq (include "istioEnabled" .) "true") (eq (dig "istio" "injection" "enabled" .Values.addons.vault) "enabled")) }}
{{- end }}
diff --git a/docs/assets/scripts/developer/k3d_dev_run_batch12U b/docs/assets/scripts/developer/k3d_dev_run_batch12U
new file mode 100644
index 0000000000..aad20a05a4
--- /dev/null
+++ b/docs/assets/scripts/developer/k3d_dev_run_batch12U
@@ -0,0 +1,2 @@
+#!/bin/bash
+set -xue
--
GitLab