Merge branch 'main' into feature/blog-template

vmware-tanzu · Sep 1, 2023 · 1a88042 · 1a88042
2 parents 0f68867 + 3d3f934
commit 1a88042
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 9 deletions.
diff --git a/docs/_pages/0005-blog.md b/docs/_pages/0005-blog.md
@@ -13,7 +13,7 @@ title: VSecM Blog
 layout: blog-home
 prev_url: /docs/security/
 permalink: /docs/blog/
-next_url: /docs/changelog/
+next_url: /docs/navigation/
 ---
 
 <p class="github-button"

diff --git a/docs/_pages/0020-preface.md b/docs/_pages/0020-preface.md
@@ -11,7 +11,7 @@
 
 title: Preface
 layout: post
-prev_url: /docs/roadmap/
+prev_url: /docs/blog/
 permalink: /docs/navigation/
 next_url: /docs/about/
 ---

diff --git a/docs/_pages/0006-changelog.md → docs/_pages/0260-changelog.md b/docs/_pages/0006-changelog.md → docs/_pages/0260-changelog.md
@@ -11,7 +11,7 @@
 
 title: Changelog
 layout: post
-prev_url: /docs/blog/
+prev_url: /
 permalink: /docs/changelog/
 next_url: /docs/releases/
 ---

diff --git a/docs/_pages/0007-releases.md → docs/_pages/0270-releases.md b/docs/_pages/0007-releases.md → docs/_pages/0270-releases.md
diff --git a/docs/_pages/0008-roadmap.md → docs/_pages/0280-roadmap.md b/docs/_pages/0008-roadmap.md → docs/_pages/0280-roadmap.md
@@ -13,7 +13,7 @@ title: Roadmap
 layout: post
 prev_url: /docs/releases/
 permalink: /docs/roadmap/
-next_url: /docs/navigation/
+next_url: /
 ---
 
 <p class="github-button"

diff --git a/docs/_pages/0990-privacy.md b/docs/_pages/0990-privacy.md
@@ -11,7 +11,7 @@
 
 title: Privacy Policy
 layout: post
-prev_url: /docs/release-management/
+prev_url: /docs/governance/
 permalink: /docs/privacy/
 next_url: /
 ---

diff --git a/helm-charts/0.21.0/Chart.yaml b/helm-charts/0.21.0/Chart.yaml
@@ -39,6 +39,15 @@ home: https://vsecm.com/
 # icon: 
 keywords:
   - secrets
+  - kubernetes
+  - secrets-manager
+  - spire
+  - spiffe
+  - zero-trust
+  - cloud-native
+  - edge
+  - secret-management
+  - security
 
 dependencies:
   - name: spire

diff --git a/helm-charts/0.21.0/charts/safe/templates/identity.yaml b/helm-charts/0.21.0/charts/safe/templates/identity.yaml
@@ -23,5 +23,5 @@ spec:
       app.kubernetes.io/name: {{ include "safe.fullname" . }}
       app.kubernetes.io/part-of: {{ .Values.global.vsecm.namespace }}
   workloadSelectorTemplates:
-    - "k8s:ns:{{`{{ .PodMeta.Namespace }}`}}"
-    - "k8s:sa:{{`{{ .PodSpec.ServiceAccountName }}`}}"
+    - "k8s:ns:{{ .Values.global.vsecm.namespace }}"
+    - "k8s:sa:{{ include "safe.serviceAccountName" . }}"
diff --git a/helm-charts/0.21.0/charts/safe/values.yaml b/helm-charts/0.21.0/charts/safe/values.yaml
@@ -62,7 +62,7 @@ serviceAccount:
   annotations: {}
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
-  name: ""
+  name: "vsecm-safe"
 
 podAnnotations: {}
 

diff --git a/helm-charts/0.21.0/charts/sentinel/values.yaml b/helm-charts/0.21.0/charts/sentinel/values.yaml
@@ -30,7 +30,7 @@ serviceAccount:
   annotations: {}
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
-  name: ""
+  name: "vsecm-sentinel"
 
 podAnnotations: {}