Merge branch 'main' into release

Current configmap template renders to a wrong KeyManager and
UpstreamAuthority configurarion when aws_kms and aws_pca are enabled and
container is crashing. The proposed changes will fix the issue.

---------

Signed-off-by: unufree <geno.velkov@gmail.com>
Signed-off-by: unufr33 <129618334+unufr33@users.noreply.github.com>
Co-authored-by: Faisal Memon <fymemon@yahoo.com>

.github/scripts/update-versions.sh

@@ -32,7 +32,7 @@ jq -r ".[].name" "${CHARTJSON}" | while read -r NAME; do
   echo Processing: "${NAME}"
   echo "  chart: ${REGISTRY}"
   echo "  current version: ${VERSION}"
-  LATEST_VERSION=$(crane ls "$REGISTRY" | grep 'v\?[0-9]*\.[0-9]*\.[0-9]\.*$' | sort -V -r | head -n 1)
+  LATEST_VERSION=$(crane ls "$REGISTRY" | grep 'v[0-9]*\.[0-9]*\.[0-9]\.*$' | sort -V -r | head -n 1)
   echo "  latest version: ${LATEST_VERSION}"
   if [ "x${VERSION}" != "x${LATEST_VERSION}" ]; then
     echo "  New version found!"

.github/tests/charts.json

@@ -2,16 +2,26 @@
   {
     "name": "kube-prometheus-stack",
     "repo": "https://prometheus-community.github.io/helm-charts",
-    "version": "75.15.1"
+    "version": "65.5.0"
   },
   {
     "name": "cert-manager",
     "repo": "https://charts.jetstack.io",
-    "version": "v1.18.2"
+    "version": "v1.16.1"
   },
   {
     "name": "ingress-nginx",
     "repo": "https://kubernetes.github.io/ingress-nginx",
-    "version": "4.13.0"
+    "version": "4.11.3"
+  },
+  {
+    "name": "mysql",
+    "repo": "https://charts.bitnami.com/bitnami",
+    "version": "11.1.19"
+  },
+  {
+    "name": "postgresql",
+    "repo": "https://charts.bitnami.com/bitnami",
+    "version": "16.0.6"
   }
 ]

.github/tests/common.sh

@@ -82,16 +82,6 @@ while true; do
 done
 )
 
-common_test_file_exists () (
-count=20
-while true; do
-        if [ -f "$1" ]; then exit 0; fi
-        sleep 2
-        count=$((count-1))
-        [ $count -le 0 ] && exit 1
-done
-)
-
 # Used just for testing. You should provide your own values as described in the install instructions.
 common_test_your_values () {
 cat > /tmp/$$.example-your-values.yaml <<EOF

.github/tests/images.json

@@ -7,13 +7,8 @@
     },
     {
       "query": "chown.image",
-      "filter": "^[0-9]\\+\\.[0-9]\\+\\.[0-9]\\+-uclibc$",
-      "sort-flags": ["-t", ".", "-k1,1n", "-k2,2n", "-k3,3n"]
-    },
-    {
-      "query": "tools.busybox.image",
-      "filter": "^[0-9]\\+\\.[0-9]\\+\\.[0-9]\\+-uclibc$",
-      "sort-flags": ["-t", ".", "-k1,1n", "-k2,2n", "-k3,3n"]
+      "filter": "LATESTSHA",
+      "sort-flags": []
     }
   ],
   "spire-agent/values.yaml": [

.github/tests/oci-charts.json

@@ -1,17 +1,7 @@
 [
-  {
-    "name": "mysql",
-    "registry": "docker.io/bitnamicharts/mysql",
-    "version": "14.0.0"
-  },
-  {
-    "name": "postgresql",
-    "registry": "docker.io/bitnamicharts/postgresql",
-    "version": "16.7.9"
-  },
   {
     "name": "envoy-gateway",
     "registry": "docker.io/envoyproxy/gateway-helm",
-    "version": "v1.4.2"
+    "version": ""
   }
 ]

.github/tests/pre-install.sh

@@ -37,13 +37,13 @@ kubectl wait --namespace ingress-nginx --for=condition=ready --timeout 60s pod -
 # external database
 
 # mysql
-"${helm_install[@]}" mysql "${HELM_REGISTRY_MYSQL}" --version "$VERSION_MYSQL" \
+"${helm_install[@]}" mysql mysql --version "$VERSION_MYSQL" --repo "$HELM_REPO_MYSQL" \
   --namespace mysql \
   --values "${DEPS}/mysql.yaml" \
   --wait
 
 # postgres
-"${helm_install[@]}" postgresql "${HELM_REGISTRY_POSTGRESQL}" --version "$VERSION_POSTGRESQL" \
+"${helm_install[@]}" postgresql postgresql --version "$VERSION_POSTGRESQL" --repo "$HELM_REPO_POSTGRESQL" \
   --namespace postgresql \
   --values "${DEPS}/postgresql.yaml" \
   --wait

.github/workflows/check-versions.yaml

@@ -27,9 +27,6 @@ jobs:
         with:
           version: ${{ env.HELM_VERSION }}
 
-      - name: Setup crane
-        uses: imjasonh/setup-crane@v0.3
-
       - name: Update test chart versions
         run: |
           ./.github/scripts/update-versions.sh
@@ -41,6 +38,9 @@ jobs:
           go-version: '1.21'
           cache: false
 
+      - name: Setup crane
+        uses: imjasonh/setup-crane@v0.3
+
       - uses: actions/setup-python@v5
         with:
           python-version: '3.9'

.github/workflows/helm-chart-ci.yaml

@@ -171,7 +171,7 @@ jobs:
       - name: Run chart-testing (install)
         run: |
           helm install -n spire-server spire-crds charts/spire-crds
-          ct install --config ct.yaml --excluded-charts spire-crds,spiffe-step-ssh \
+          ct install --config ct.yaml --excluded-charts spire-crds \
             --target-branch ${{ github.base_ref }}
 
       - name: Test summary

charts/spiffe-step-ssh/Chart.yaml

@@ -1,42 +0,0 @@
-apiVersion: v2
-name: spiffe-step-ssh
-description: sshd signed host certificates using SPIFFE for trust and step CA
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "1.16.0"
-
-keywords: ["spiffe", "step", "step-ca", "ssh"]
-home: https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spiffe-step-ssh
-sources:
-  - https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spiffe-step-ssh
-icon: https://spiffe.io/img/logos/spire/icon/color/spire-icon-color.png
-maintainers:
-  - name: kfox1111
-    email: Kevin.Fox@pnnl.gov
-
-dependencies:
-  - name: spire-lib
-    repository: file://../spire/charts/spire-lib
-    version: 0.1.0
-  - name: step-certificates
-    alias: step
-    repository: https://smallstep.github.io/helm-charts/
-    version: 1.27.4

charts/spiffe-step-ssh/README.md

@@ -1,65 +0,0 @@
-spire-values.yaml
-```
-spire-server:
-  nodeAttestor:
-    httpChallenge:
-      enabled: true
-  controllerManager:
-    identities:
-      clusterSPIFFEIDs:
-        spiffe-step-ssh-config:
-          type: raw
-          namespaceSelector:
-            matchLabels:
-              "kubernetes.io/metadata.name": default
-          podSelector:
-            matchLabels:
-              app: spiffe-step-ssh
-              component: config
-        spiffe-step-ssh-fetchca:
-          type: raw
-          namespaceSelector:
-            matchLabels:
-              "kubernetes.io/metadata.name": default
-          podSelector:
-            matchLabels:
-              app: spiffe-step-ssh
-              component: fetchca
-          dnsNameTemplates:
-          - "spiffe-step-ssh-fetchca.{{ .TrustDomain }}"
-```
-
-```shell
-helm upgrade --install -n spire-server spire-crds spire-crds --repo https://spiffe.github.io/helm-charts-hardened/ --create-namespace
-helm upgrade --install -n spire-server spire spire --repo https://spiffe.github.io/helm-charts-hardened/ -f spire-values.yaml --set global.spire.ingressControllerType=ingress-nginx,spire-server.ingress.enabled=true
-```
-
-```shell
-helm upgrade --install ingress-nginx ingress-nginx -n ingress-nginx --create-namespace --repo https://kubernetes.github.io/ingress-nginx --set controller.service.type=ClusterIP,controller.service.externalIPs[0]=$(minikube ip) --set controller.watchIngressWithoutClass=true --set controller.extraArgs.enable-ssl-passthrough=
-```
-
-```shell
-PASSWORD=$(openssl rand -base64 48)
-echo "$PASSWORD" > spiffe-step-ssh-password.txt
-step ca init --helm --deployment-type=Standalone --name='My CA' --dns spiffe-step-ssh.example.org --ssh --address :8443 --provisioner default --password-file spiffe-step-ssh-password.txt > spiffe-step-ssh-values.yaml
-```
-
-ingress-values.yaml
-```yaml
-global:
-  spiffe:
-    ingressControllerType: ingress-nginx
-stepIngress:
-  enabled: true
-fetchCA:
-  ingress:
-    enabled: true
-```
-
-```shell
-helm upgrade --install spiffe-step-ssh . --set caPassword=`cat spiffe-step-ssh-password.txt` -f spiffe-step-ssh-values.yaml -f ingress-values.yaml --set trustDomain=example.org
-```
-
-<!-- The parameters section is generated using helm-docs.sh and should not be edited by hand. -->
-
-## Parameters

charts/spiffe-step-ssh/ci/default-values.yaml

@@ -1 +0,0 @@
-trustDomain: example.org

charts/spiffe-step-ssh/files/ssh_x5c.tpl

@@ -1,13 +0,0 @@
-{{- if eq (len .AuthorizationCrt.URIs) 1 }}
-{{-   $san := printf "%s" (index .AuthorizationCrt.URIs 0) }}
-{{-   if hasPrefix "spiffe://@TRUST_DOMAIN@/@PREFIX@/" $san }}
-{{-     $name := trimPrefix "spiffe://@TRUST_DOMAIN@/@PREFIX@/" $san }}
-{
-  "type": {{ toJson .Type }},
-  "keyId": {{ toJson $name }},
-  "principals": [{{ toJson $name }}],
-  "extensions": {{ toJson .Extensions }},
-  "criticalOptions": {{ toJson .CriticalOptions }}
-}
-{{-   end }}
-{{- end }}

charts/spiffe-step-ssh/templates/NOTES.txt

@@ -1,5 +0,0 @@
-Installed {{ .Chart.Name }}…
-
-Configure your ssh clients with known_hosts file with:
-
-@cert-authority *.{{ .Values.trustDomain }} {{ .Values.inject.certificates.ssh_host_ca }}

charts/spiffe-step-ssh/templates/_helpers.tpl

@@ -1,83 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "spiffe-step-ssh.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "spiffe-step-ssh.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "spiffe-step-ssh.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "spiffe-step-ssh.labels" -}}
-helm.sh/chart: {{ include "spiffe-step-ssh.chart" . }}
-{{ include "spiffe-step-ssh.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "spiffe-step-ssh.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "spiffe-step-ssh.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "spiffe-step-ssh.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "spiffe-step-ssh.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
-{{/* Takes in a dictionary with keys:
- * global - the standard global object
- * ingress - a standard format ingress config object
-*/}}
-{{- define "spiffe-step-ssh.ingress-controller-type" }}
-{{-   $type := "" }}
-{{-   if ne (len (dig "spiffe" "ingressControllerType" "" .global)) 0 }}
-{{-     $type = .global.spiffe.ingressControllerType }}
-{{-   else if ne .ingress.controllerType "" }}
-{{-     $type = .ingress.controllerType }}
-{{-   else if (dig "openshift" false .global) }}
-{{-     $type = "openshift" }}
-{{-   else }}
-{{-     $type = "other" }}
-{{-   end }}
-{{-   if not (has $type (list "ingress-nginx" "openshift" "other")) }}
-{{-     fail "Unsupported ingress controller type specified. Must be one of [ingress-nginx, openshift, other]" }}
-{{-   end }}
-{{-   $type }}
-{{- end }}

charts/spiffe-step-ssh/templates/config-configmap.yaml

@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "spiffe-step-ssh.fullname" . }}-config-deployment
-  labels:
-    {{- include "spiffe-step-ssh.labels" . | nindent 4 }}
-data:
-  spiffe-helper.conf: |
-    agent_address = "/spiffe-workload-api/spire-agent.sock"
-    cmd = "sh"
-    cmd_args = "/config-deployment/update.sh"
-    cert_dir = "/certs"
-    svid_file_name = "tls.crt"
-    svid_key_file_name = "tls.key"
-    svid_bundle_file_name = "ca.pem"
-    add_intermediates_to_bundle = false
-  update.sh: |
-    #!/bin/sh
-    export ROOTS=$(base64 /certs/ca.pem | tr '\n' ' ' | sed 's/ //g')
-    echo Updating Roots to "$ROOTS"
-    cat /config/ca.json > /work/ca.json
-    yq e -i -ojson '.authority.provisioners |= map(select(.name == "x5c@spiffe").roots = env(ROOTS))' /work/ca.json
-    /helper/kubectl create configmap {{ include "spiffe-step-ssh.fullname" . }}-config -n "{{ .Release.Namespace }}" --from-file=/work/ca.json --from-file=/config/defaults.json --from-file=/config/ssh_x5c.tpl --dry-run=client -o yaml | /helper/kubectl apply -f -
-    /helper/kubectl rollout restart statefulset {{ include "spiffe-step-ssh.fullname" . }} -n "{{ .Release.Namespace }}"
-    echo $?

charts/spiffe-step-ssh/templates/config-deployment.yaml

@@ -1,143 +0,0 @@
-{{- $configSum := (include (print $.Template.BasePath "/config-configmap.yaml") . | sha256sum) }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "spiffe-step-ssh.fullname" . }}-config
-  labels:
-    {{- include "spiffe-step-ssh.labels" . | nindent 4 }}
-    app: spiffe-step-ssh
-    component: config
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      {{- include "spiffe-step-ssh.selectorLabels" . | nindent 6 }}
-      app: spiffe-step-ssh
-      component: config
-  template:
-    metadata:
-      annotations:
-        checksum/config: {{ $configSum }}
-        {{- with .Values.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      labels:
-        {{- include "spiffe-step-ssh.labels" . | nindent 8 }}
-        {{- with .Values.podLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-        app: spiffe-step-ssh
-        component: config
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "spiffe-step-ssh.serviceAccountName" . }}-svc-config
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      initContainers:
-      - name: setup-volume-p1
-        image: {{ template "spire-lib.image" (dict "image" .Values.busybox.image "global" .Values.global) }}
-        imagePullPolicy: {{ .Values.busybox.image.pullPolicy }}
-        command:
-        - sh
-        - -c
-        - 'cp -a /bin/busybox /helper'
-        securityContext:
-          {{- toYaml .Values.securityContext | nindent 12 }}
-        volumeMounts:
-        - name: spiffe-helper
-          mountPath: /helper
-        resources:
-          {{- toYaml .Values.config.resources | nindent 12 }}
-      - name: setup-volume-p2
-        image: {{ template "spire-lib.kubectl-image" (dict "appVersion" $.Chart.AppVersion "image" .Values.kubectl.image "global" .Values.global "KubeVersion" .Capabilities.KubeVersion.Version) }}
-        imagePullPolicy: {{ .Values.kubectl.image.pullPolicy }}
-        command:
-        - /helper/busybox
-        - sh
-        - -c
-        - '/helper/busybox cp -a /bin/kubectl /helper'
-        securityContext:
-          {{- toYaml .Values.securityContext | nindent 12 }}
-        volumeMounts:
-        - name: spiffe-helper
-          mountPath: /helper
-        resources:
-          {{- toYaml .Values.config.resources | nindent 12 }}
-      - name: setup-volume-p3
-        image: {{ template "spire-lib.image" (dict "image" .Values.spiffeHelper.image "global" .Values.global) }}
-        imagePullPolicy: {{ .Values.spiffeHelper.image.pullPolicy }}
-        command:
-        - /helper/busybox
-        - sh
-        - -c
-        - '/helper/busybox cp -a /spiffe-helper /helper && /helper/busybox rm -f /helper/busybox'
-        securityContext:
-          {{- toYaml .Values.securityContext | nindent 12 }}
-        volumeMounts:
-        - name: spiffe-helper
-          mountPath: /helper
-        resources:
-          {{- toYaml .Values.config.resources | nindent 12 }}
-      containers:
-      - name: {{ .Chart.Name }}
-        securityContext:
-          {{- toYaml .Values.securityContext | nindent 12 }}
-        image: {{ template "spire-lib.image" (dict "image" .Values.yq.image "global" .Values.global) }}
-        imagePullPolicy: {{ .Values.yq.image.pullPolicy }}
-        command:
-        - /helper/spiffe-helper
-        - -config
-        - /config-deployment/spiffe-helper.conf
-        resources:
-          {{- toYaml .Values.config.resources | nindent 12 }}
-        volumeMounts:
-        - name: spiffe-helper
-          mountPath: /helper
-          readOnly: true
-        - name: config
-          mountPath: /config
-          readOnly: true
-        - name: config-deployment
-          mountPath: /config-deployment
-          readOnly: true
-        - name: certdir
-          mountPath: /certs
-        - name: spiffe-workload-api
-          mountPath: /spiffe-workload-api
-          readOnly: true
-        - name: workdir
-          mountPath: /work
-      volumes:
-      - name: spiffe-workload-api
-        csi:
-          driver: {{ .Values.csiDriver | quote }}
-          readOnly: true
-      - name: config-deployment
-        configMap:
-          name: {{ include "spiffe-step-ssh.fullname" . }}-config-deployment
-      - name: config
-        configMap:
-          name: {{ include "spiffe-step-ssh.fullname" . }}-config-raw
-      - name: certdir
-        emptyDir: {}
-      - name: spiffe-helper-config
-        emptyDir: {}
-      - name: spiffe-helper
-        emptyDir: {}
-      - name: workdir
-        emptyDir: {}
-      {{- with .Values.config.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.config.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.config.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}

charts/spiffe-step-ssh/templates/config-role.yaml

@@ -1,41 +0,0 @@
-kind: Role
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: {{ include "spiffe-step-ssh.fullname" . }}-svc-config
-rules:
-  - apiGroups: [""]
-    resources: [configmaps]
-    verbs:
-      - create
-  - apiGroups: [""]
-    resources: [configmaps]
-    resourceNames: [{{ include "spiffe-step-ssh.fullname" . }}-config]
-    verbs:
-      - get
-      - update
-      - patch
-  - apiGroups: ["apps"]
-    resources: [statefulsets]
-    resourceNames: [{{ include "spiffe-step-ssh.fullname" . }}]
-    verbs:
-      - get
-      - patch
-  - apiGroups: ["apps"]
-    resources: [deployments]
-    resourceNames: [{{ include "spiffe-step-ssh.fullname" . }}-fetchca]
-    verbs:
-      - get
-      - patch
----
-kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: {{ include "spiffe-step-ssh.fullname" . }}-svc-config
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "spiffe-step-ssh.fullname" . }}-svc-config
-    namespace: {{ .Release.Namespace }}
-roleRef:
-  kind: Role
-  name: {{ include "spiffe-step-ssh.fullname" . }}-svc-config
-  apiGroup: rbac.authorization.k8s.io

charts/spiffe-step-ssh/templates/config-serviceaccount.yaml

@@ -1,13 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "spiffe-step-ssh.serviceAccountName" . }}-svc-config
-  labels:
-    {{- include "spiffe-step-ssh.labels" . | nindent 4 }}
-    component: config
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}

charts/spiffe-step-ssh/templates/fetchca-configmap.yaml

@@ -1,28 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "spiffe-step-ssh.fullname" . }}-fetchca
-  labels:
-    {{- include "spiffe-step-ssh.labels" . | nindent 4 }}
-data:
-  spiffe-helper-init.conf: |
-    agent_address = "/spiffe-workload-api/spire-agent.sock"
-    cmd = ""
-    cmd_args = ""
-    cert_dir = "/certs"
-    svid_file_name = "tls.crt"
-    svid_key_file_name = "tls.key"
-    svid_bundle_file_name = "ca.pem"
-    add_intermediates_to_bundle = false
-  spiffe-helper-sidecar.conf: |
-    agent_address = "/spiffe-workload-api/spire-agent.sock"
-    cmd = "/busybox/busybox"
-    cmd_args = "sh /update.sh"
-    cert_dir = "/certs"
-    svid_file_name = "tls.crt"
-    svid_key_file_name = "tls.key"
-    svid_bundle_file_name = "ca.pem"
-    add_intermediates_to_bundle = false
-  update.sh: |
-    #!/bin/sh
-    /busybox/busybox kill -HUP `/busybox/busybox busybox cat /pid/pid`

charts/spiffe-step-ssh/templates/fetchca-deployment.yaml

@@ -1,182 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "spiffe-step-ssh.fullname" . }}-fetchca
-  labels:
-    {{- include "spiffe-step-ssh.labels" . | nindent 4 }}
-    app: spiffe-step-ssh
-    component: fetchca
-spec:
-  {{- if not .Values.fetchCA.autoscaling.enabled }}
-  replicas: {{ .Values.fetchCA.replicaCount }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "spiffe-step-ssh.selectorLabels" . | nindent 6 }}
-      app: spiffe-step-ssh
-      component: fetchca
-  template:
-    metadata:
-      {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "spiffe-step-ssh.labels" . | nindent 8 }}
-        {{- with .Values.podLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-        app: spiffe-step-ssh
-        component: fetchca
-    spec:
-      shareProcessNamespace: true
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "spiffe-step-ssh.serviceAccountName" . }}-fetchca
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      initContainers:
-        - name: busybox-volume
-          image: {{ template "spire-lib.image" (dict "image" .Values.busybox.image "global" .Values.global) }}
-          imagePullPolicy: {{ .Values.busybox.image.pullPolicy }}
-          command:
-          - sh
-          - -c
-          - 'cp -a /bin/busybox /busybox'
-          volumeMounts:
-          - name: busybox
-            mountPath: /busybox
-          resources:
-            {{- toYaml .Values.fetchCA.spiffeHelper.resources | nindent 12 }}
-        - name: init-tls
-          image: {{ template "spire-lib.image" (dict "image" .Values.spiffeHelper.image "global" .Values.global) }}
-          imagePullPolicy: {{ .Values.spiffeHelper.image.pullPolicy }}
-          command:
-          - /spiffe-helper
-          - -config
-          - /etc/spiffe-helper.conf
-          - -daemon-mode=false
-          volumeMounts:
-          - name: spiffe-workload-api
-            mountPath: /spiffe-workload-api
-            readOnly: true
-          - name: config
-            mountPath: /etc/spiffe-helper.conf
-            subPath: spiffe-helper-init.conf
-            readOnly: true
-          - name: certs
-            mountPath: /certs
-          resources:
-            {{- toYaml .Values.fetchCA.spiffeHelper.resources | nindent 12 }}
-      containers:
-        - name: {{ .Chart.Name }}-fetchca
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: {{ template "spire-lib.image" (dict "image" .Values.nginx.image "global" .Values.global) }}
-          imagePullPolicy: {{ .Values.nginx.image.pullPolicy }}
-          command:
-          - /bin/sh
-          - -c
-          - |
-            echo $$$$ > /pid/pid
-            cat > /etc/nginx/conf.d/ssl.conf <<EOF
-            server {
-                listen       8443 ssl;
-                server_name  localhost;
-                ssl_certificate     /certs/tls.crt;
-                ssl_certificate_key /certs/tls.key;
-                location / {
-                    root   /usr/share/nginx/html;
-                    index  root_ca.crt index.html index.htm;
-                }
-                error_page   500 502 503 504  /50x.html;
-                location = /50x.html {
-                    root   /usr/share/nginx/html;
-                }
-            }
-            EOF
-            exec nginx -g "daemon off;"
-          ports:
-            - name: http
-              containerPort: 8443
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /
-              port: http
-              scheme: HTTPS
-          readinessProbe:
-            httpGet:
-              path: /
-              port: http
-              scheme: HTTPS
-          resources:
-            {{- toYaml .Values.fetchCA.resources | nindent 12 }}
-          volumeMounts:
-          - name: certs
-            mountPath: /certs
-            readOnly: true
-          - name: pid
-            mountPath: /pid
-          - name: share
-            mountPath: /usr/share/nginx/html
-        - name: update-tls
-          image: {{ template "spire-lib.image" (dict "image" .Values.spiffeHelper.image "global" .Values.global) }}
-          imagePullPolicy: {{ .Values.spiffeHelper.image.pullPolicy }}
-          command:
-          - /spiffe-helper
-          - -config
-          - /etc/spiffe-helper.conf
-          volumeMounts:
-          - name: certs
-            mountPath: /certs
-          - name: spiffe-workload-api
-            mountPath: /spiffe-workload-api
-            readOnly: true
-          - name: config
-            mountPath: /etc/spiffe-helper.conf
-            subPath: spiffe-helper-sidecar.conf
-            readOnly: true
-          - name: config
-            mountPath: /update.sh
-            subPath: update.sh
-            readOnly: true
-          - name: pid
-            mountPath: /pid
-            readOnly: true
-          - name: busybox
-            mountPath: /busybox
-            readOnly: true
-          resources:
-            {{- toYaml .Values.fetchCA.spiffeHelper.resources | nindent 12 }}
-      volumes:
-      - name: certs
-        emptyDir: {}
-      - name: pid
-        emptyDir: {}
-      - name: busybox
-        emptyDir: {}
-      - name: config
-        configMap:
-          name: {{ include "spiffe-step-ssh.fullname" . }}-fetchca
-      - name: spiffe-workload-api
-        csi:
-          driver: {{ .Values.csiDriver | quote }}
-          readOnly: true
-      - name: share
-        configMap:
-          name: {{ include "spiffe-step-ssh.fullname" . }}-certs
-      {{- with .Values.fetchCA.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.fetchCA.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.fetchCA.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}

charts/spiffe-step-ssh/templates/fetchca-hpa.yaml

@@ -1,32 +0,0 @@
-{{- if .Values.fetchCA.autoscaling.enabled }}
-apiVersion: autoscaling/v2
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "spiffe-step-ssh.fullname" . }}-fetchCA
-  labels:
-    {{- include "spiffe-step-ssh.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "spiffe-step-ssh.fullname" . }}-fetchca
-  minReplicas: {{ .Values.fetchCA.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.fetchCA.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.fetchCA.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.fetchCA.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.fetchCA.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.fetchCA.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}

charts/spiffe-step-ssh/templates/fetchca-ingress.yaml

@@ -1,31 +0,0 @@
-{{- if .Values.fetchCA.ingress.enabled -}}
-{{- $ingressControllerType := include "spiffe-step-ssh.ingress-controller-type" (dict "global" .Values.global "ingress" .Values.fetchCA.ingress) }}
-{{- $fullName := printf "%s-fetchca" (include "spiffe-step-ssh.fullname" .) -}}
-{{- $path := "/" }}
-{{- $pathType := "Prefix" }}
-{{- $tlsSection := true }}
-{{- $annotations := deepCopy .Values.fetchCA.ingress.annotations }}
-{{- if eq $ingressControllerType "ingress-nginx" }}
-{{-   $_ := set $annotations "nginx.ingress.kubernetes.io/ssl-redirect" "true" }}
-{{-   $_ := set $annotations "nginx.ingress.kubernetes.io/force-ssl-redirect" "true" }}
-{{-   $_ := set $annotations "nginx.ingress.kubernetes.io/backend-protocol" "HTTPS" }}
-{{-   $_ := set $annotations "nginx.ingress.kubernetes.io/ssl-passthrough" "true" }}
-{{- else if eq $ingressControllerType "openshift" }}
-{{-   $_ := set $annotations "route.openshift.io/termination" "passthrough" }}
-{{-   $path = "" }}
-{{-   $pathType = "ImplementationSpecific" }}
-{{-   $tlsSection = false }}
-{{- end }}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{ include "spiffe-step-ssh.labels" . | nindent 4}}
-  {{- with $annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{ include "spire-lib.ingress-spec" (dict "ingress" .Values.fetchCA.ingress "svcName" $fullName "port" .Values.fetchCA.service.port "path" $path "pathType" $pathType "tlsSection" $tlsSection "Values" .Values) | nindent 2 }}
-{{- end }}

charts/spiffe-step-ssh/templates/fetchca-service.yaml

@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "spiffe-step-ssh.fullname" . }}-fetchca
-  labels:
-    {{- include "spiffe-step-ssh.labels" . | nindent 4 }}
-    app: spiffe-step-ssh
-    component: fetchca
-spec:
-  type: {{ .Values.fetchCA.service.type }}
-  ports:
-    - port: {{ .Values.fetchCA.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    {{- include "spiffe-step-ssh.selectorLabels" . | nindent 4 }}

charts/spiffe-step-ssh/templates/fetchca-serviceaccount.yaml

@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "spiffe-step-ssh.serviceAccountName" . }}-fetchca
-  labels:
-    {{- include "spiffe-step-ssh.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}

charts/spiffe-step-ssh/templates/ssh-certificate-issuer-password-secret.yaml

@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "spiffe-step-ssh.fullname" . }}-certificate-issuer-password
-  labels:
-    {{- include "spiffe-step-ssh.labels" . | nindent 4 }}
-data:
-  password: {{ .Values.caPassword | b64enc }}

charts/spiffe-step-ssh/templates/step-ca-password-secret.yaml

@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "spiffe-step-ssh.fullname" . }}-ca-password
-  labels:
-    {{- include "spiffe-step-ssh.labels" . | nindent 4 }}
-data:
-  password: {{ .Values.caPassword | b64enc }}

charts/spiffe-step-ssh/templates/step-certs-configmap.yaml

@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "spiffe-step-ssh.fullname" . }}-certs
-  labels:
-    {{- include "spiffe-step-ssh.labels" . | nindent 4 }}
-data:
-  "root_ca.crt": |
-    {{- .Values.inject.certificates.root_ca | nindent 4}}
-  "intermediate_ca.crt": |
-    {{ .Values.inject.certificates.intermediate_ca | nindent 4}}
-  "ssh_host_ca_key.pub": |
-    {{ .Values.inject.certificates.ssh_host_ca | nindent 4 }}
-  "ssh_user_ca_key.pub": |
-    {{ .Values.inject.certificates.ssh_user_ca | nindent 4 }}

charts/spiffe-step-ssh/templates/step-config.yaml

@@ -1,32 +0,0 @@
-{{- define "spiffe-step-ssh.config-provisioners" }}
-type: X5C
-name: "x5c@spiffe"
-roots: ""
-claims:
-  maxTLSCertDuration: {{ .Values.maxTLSCertDuration | quote }}
-  defaultTLSCertDuration: {{ .Values.defaultTLSCertDuration | quote }}
-  disableRenewal: true
-  enableSSHCA: true
-disableCustomSANs: true
-options:
- ssh:
-   templateFile: /home/step/config/ssh_x5c.tpl
-{{- end }}
-{{ $ca := deepCopy (index .Values.inject.config.files "ca.json") }}
-{{ $_ := set $ca.authority "provisioners" (list (include "spiffe-step-ssh.config-provisioners" . | fromYaml )) }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "spiffe-step-ssh.fullname" . }}-config-raw
-  labels:
-    {{- include "spiffe-step-ssh.labels" . | nindent 4 }}
-data:
-  "ca.json": |
-    {{- $ca | toPrettyJson | nindent 4 }}
-  "defaults.json": |
-    {{- index .Values.inject.config.files "defaults.json" | toPrettyJson | nindent 4 }}
-{{- if eq .Values.trustDomain "" }}
-{{-   fail "You must set trustDomain" }}
-{{- end }}
-  "ssh_x5c.tpl": |
-    {{- .Files.Get "files/ssh_x5c.tpl" | replace "@TRUST_DOMAIN@" .Values.trustDomain | replace "@PREFIX@" .Values.prefix | nindent 4}}

charts/spiffe-step-ssh/templates/step-ingress.yaml

@@ -1,31 +0,0 @@
-{{- if .Values.stepIngress.enabled -}}
-{{- $ingressControllerType := include "spiffe-step-ssh.ingress-controller-type" (dict "global" .Values.global "ingress" .Values.stepIngress) }}
-{{- $fullName := printf "%s" (include "spiffe-step-ssh.fullname" .) -}}
-{{- $path := "/" }}
-{{- $pathType := "Prefix" }}
-{{- $tlsSection := true }}
-{{- $annotations := deepCopy .Values.stepIngress.annotations }}
-{{- if eq $ingressControllerType "ingress-nginx" }}
-{{-   $_ := set $annotations "nginx.ingress.kubernetes.io/ssl-redirect" "true" }}
-{{-   $_ := set $annotations "nginx.ingress.kubernetes.io/force-ssl-redirect" "true" }}
-{{-   $_ := set $annotations "nginx.ingress.kubernetes.io/backend-protocol" "HTTPS" }}
-{{-   $_ := set $annotations "nginx.ingress.kubernetes.io/ssl-passthrough" "true" }}
-{{- else if eq $ingressControllerType "openshift" }}
-{{-   $_ := set $annotations "route.openshift.io/termination" "passthrough" }}
-{{-   $path = "" }}
-{{-   $pathType = "ImplementationSpecific" }}
-{{-   $tlsSection = false }}
-{{- end }}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{ include "spiffe-step-ssh.labels" . | nindent 4}}
-  {{- with $annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{ include "spire-lib.ingress-spec" (dict "ingress" .Values.stepIngress "svcName" $fullName "port" .Values.step.service.port "path" $path "pathType" $pathType "tlsSection" $tlsSection "Values" .Values) | nindent 2 }}
-{{- end }}

charts/spiffe-step-ssh/templates/step-secret.yaml

@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "spiffe-step-ssh.fullname" . }}-secrets
-  labels:
-    {{- include "spiffe-step-ssh.labels" . | nindent 4 }}
-data:
-  root_ca_key: {{ .Values.inject.secrets.x509.root_ca_key | b64enc }}
-  intermediate_ca_key: {{ .Values.inject.secrets.x509.intermediate_ca_key | b64enc }}
-  ssh_host_ca_key: {{ .Values.inject.secrets.ssh.host_ca_key | b64enc }}
-  ssh_user_ca_key: {{ .Values.inject.secrets.ssh.user_ca_key | b64enc }}

charts/spiffe-step-ssh/templates/step-ssh-host-ca-password-secret.yaml

@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "spiffe-step-ssh.fullname" . }}-ssh-host-ca-password
-  labels:
-    {{- include "spiffe-step-ssh.labels" . | nindent 4 }}
-data:
-  password: {{ .Values.caPassword | b64enc }}

charts/spiffe-step-ssh/templates/step-ssh-user-ca-password-secret.yaml

@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "spiffe-step-ssh.fullname" . }}-ssh-user-ca-password
-  labels:
-    {{- include "spiffe-step-ssh.labels" . | nindent 4 }}
-data:
-  password: {{ .Values.caPassword | b64enc }}

charts/spiffe-step-ssh/values.yaml

@@ -1,292 +0,0 @@
-# Default values for spiffe-step-ssh.
-# SPDX-License-Identifier: APACHE-2.0
-
-global:
-  spiffe:
-    ## @param global.spiffe.ingressControllerType Specify what type of ingress controller you're using to add the necessary annotations accordingly. If blank, autodetection is attempted. If other, no annotations will be added. Must be one of [ingress-nginx, openshift, other, ""].
-    ingressControllerType: ""
-
-## @param trustDomain The trust domain for SPIRE
-trustDomain: ""
-## @param caPassword Password securing the SSH CA
-caPassword: ""
-## @param maxTLSCertDuration The maximum duration the X5C traded cert is valid for.
-maxTLSCertDuration: 24h
-## @param defaultTLSCertDuration The default duration the X5C traded cert is valid for.
-defaultTLSCertDuration: 1h
-## @param prefix Prefix where hosts show up that are allowed to get ssh host certs
-prefix: sshd
-## @param csiDriver The csi driver to use
-csiDriver: csi.spiffe.io
-
-## @skip inject
-## These will be generated by the step-ca tool
-inject:
-  secrets:
-    x509:
-      root_ca_key: ""
-      intermediate_ca_key: ""
-    ssh:
-      host_ca_key: ""
-      user_ca_key: ""
-  config:
-    files:
-      ca.json:
-        authority: {}
-  certificates:
-    root_ca: ""
-    intermediate_ca: ""
-    ssh_host_ca: ""
-    ssh_user_ca: ""
-
-stepIngress:
-  ## @param stepIngress.enabled Flag to enable ingress
-  enabled: false
-  ## @param stepIngress.className Ingress class name
-  className: ""
-  ## @param stepIngress.controllerType Specify what type of ingress controller you're using to add the necessary annotations accordingly. If blank, autodetection is attempted. If other, no annotations will be added. Must be one of [ingress-nginx, openshift, other, ""].
-  controllerType: ""
-  ## @param stepIngress.annotations [object] Annotations for the ingress object
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-    # nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
-    # If Profile Type == https_spiffe:
-    # nginx.ingress.kubernetes.io/ssl-passthrough: "true"
-
-  ## @param stepIngress.host Host name for the ingress. If no '.' in host, trustDomain is automatically appended. The rest of the rules will be autogenerated. For more customizability, use hosts[] instead.
-  host: "spiffe-step-ssh"
-
-  ## @param stepIngress.tlsSecret Secret that has the certs. If blank will use default certs. Used with host var.
-  tlsSecret: ""
-
-  ## @param stepIngress.hosts [array] Host paths for ingress object. If empty, rules will be built based on the host var.
-  hosts: []
-  #  - host: spiffe-step-ssh.example.org
-  #    paths:
-  #      - path: /
-  #        pathType: Prefix
-
-  ## @param stepIngress.tls [array] Secrets containing TLS certs to enable https on ingress. If empty, rules will be built based on the host and tlsSecret vars.
-  tls: []
-  #  - hosts:
-  #      - spiffe-step-ssh.example.org
-
-## @skip step
-step:
-  service:
-    port: 443
-    targetPort: 8443
-  inject:
-    enabled: false
-  bootstrap:
-    enabled: false
-    configmaps: false
-    secrets: false
-  existingSecrets:
-    enabled: true
-    ca: true
-    issuer: true
-    certsAsSecret: false
-    configAsSecret: false
-    sshHostCa: true
-    sshUserCa: true
-
-spiffeHelper:
-  ## @param spiffeHelper.image.registry The OCI registry to pull the image from
-  ## @param spiffeHelper.image.repository The repository within the registry
-  ## @param spiffeHelper.image.pullPolicy The image pull policy
-  ## @param spiffeHelper.image.tag Overrides the image tag whose default is the chart appVersion
-  ##
-  image:
-    registry: ghcr.io
-    repository: spiffe/spiffe-helper
-    pullPolicy: IfNotPresent
-    tag: 0.8.0
-
-nginx:
-  ## @param nginx.image.registry The OCI registry to pull the image from
-  ## @param nginx.image.repository The repository within the registry
-  ## @param nginx.image.pullPolicy The image pull policy
-  ## @param nginx.image.tag Overrides the image tag whose default is the chart appVersion
-  ##
-  image:
-    registry: docker.io
-    repository: nginxinc/nginx-unprivileged
-    pullPolicy: IfNotPresent
-    tag: 1.25.3-alpine
-
-kubectl:
-  ## @param kubectl.image.registry The OCI registry to pull the image from
-  ## @param kubectl.image.repository The repository within the registry
-  ## @param kubectl.image.pullPolicy The image pull policy
-  ## @param kubectl.image.tag Overrides the image tag whose default is the chart appVersion
-  ##
-  image:
-    registry: registry.k8s.io
-    repository: kubectl
-    pullPolicy: IfNotPresent
-    tag: ""
-
-yq:
-  ## @param yq.image.registry The OCI registry to pull the image from
-  ## @param yq.image.repository The repository within the registry
-  ## @param yq.image.pullPolicy The image pull policy
-  ## @param yq.image.tag Overrides the image tag whose default is the chart appVersion
-  ##
-  image:
-    registry: docker.io
-    repository: mikefarah/yq
-    pullPolicy: IfNotPresent
-    tag: "4.40.5"
-
-busybox:
-  ## @param busybox.image.registry The OCI registry to pull the image from
-  ## @param busybox.image.repository The repository within the registry
-  ## @param busybox.image.pullPolicy The image pull policy
-  ## @param busybox.image.tag Overrides the image tag whose default is the chart appVersion
-  ##
-  image:
-    registry: docker.io
-    repository: busybox
-    pullPolicy: IfNotPresent
-    tag: "1.36.1-uclibc"
-
-## @param imagePullSecrets [array] Pull secrets for images
-imagePullSecrets: []
-
-## @param nameOverride Name override
-nameOverride: ""
-
-## @param fullnameOverride Fullname override
-fullnameOverride: ""
-
-## @param serviceAccount.create Specifies whether a service account should be created
-## @param serviceAccount.annotations [object] Annotations to add to the service account
-## @param serviceAccount.name The name of the service account to use. If not set and create is true, a name is generated.
-##
-serviceAccount:
-  create: true
-  annotations: {}
-  name: ""
-
-## @param podAnnotations [object] Additional pod annotations to add
-podAnnotations: {}
-## @param podLabels [object] Additional pod labels to add
-podLabels: {}
-
-## @param podSecurityContext [object} Specify pod security context settings
-podSecurityContext: {}
-  # fsGroup: 2000
-
-## @param securityContext [object] Specify container security context settings
-securityContext:
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-  # FIXME
-  runAsUser: 0
-
-fetchCA:
-  ## @param fetchCA.replicaCount Number of replicas to launch
-  replicaCount: 1
-
-  ## @param fetchCA.service.type The type of service to deploy
-  ## @param fetchCA.service.port The port number of the service port
-  service:
-    type: ClusterIP
-    port: 443
-
-  ingress:
-    ## @param fetchCA.ingress.enabled Flag to enable ingress
-    enabled: false
-    ## @param fetchCA.ingress.className Ingress class name
-    className: ""
-    ## @param fetchCA.ingress.controllerType Specify what type of ingress controller you're using to add the necessary annotations accordingly. If blank, autodetection is attempted. If other, no annotations will be added. Must be one of [ingress-nginx, openshift, other, ""].
-    controllerType: ""
-    ## @param fetchCA.ingress.annotations [object] Annotations for the ingress object
-    annotations: {}
-      # kubernetes.io/ingress.class: nginx
-      # kubernetes.io/tls-acme: "true"
-      # nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
-      # If Profile Type == https_spiffe:
-      # nginx.ingress.kubernetes.io/ssl-passthrough: "true"
-
-    ## @param fetchCA.ingress.host Host name for the ingress. If no '.' in host, trustDomain is automatically appended. The rest of the rules will be autogenerated. For more customizability, use hosts[] instead.
-    host: "spiffe-step-ssh-fetchca"
-
-    ## @param fetchCA.ingress.tlsSecret Secret that has the certs. If blank will use default certs. Used with host var.
-    tlsSecret: ""
-
-    ## @param fetchCA.ingress.hosts [array] Host paths for ingress object. If empty, rules will be built based on the host var.
-    hosts: []
-    #  - host: spiffe-step-ssh-fetchca.example.org
-    #    paths:
-    #      - path: /
-    #        pathType: Prefix
-
-    ## @param fetchCA.ingress.tls [array] Secrets containing TLS certs to enable https on ingress. If empty, rules will be built based on the host and tlsSecret vars.
-    tls: []
-    #  - hosts:
-    #      - spiffe-step-ssh-fetchca.example.org
-
-  ## @param fetchCA.autoscaling.enabled Enable autoscaling
-  ## @param fetchCA.autoscaling.minReplicas Minimum number of replicas to deploy
-  ## @param fetchCA.autoscaling.maxReplicas Maximum number of replicas to deploy
-  ## @param fetchCA.autoscaling.targetCPUUtilizationPercentage Target CPU utilization to use for autoscaling
-  autoscaling:
-    enabled: false
-    minReplicas: 1
-    maxReplicas: 100
-    targetCPUUtilizationPercentage: 80
-    # targetMemoryUtilizationPercentage: 80
-
-  ## @param fetchCA.resources [object] Specify resources
-  resources: {}
-    # limits:
-    #   cpu: 100m
-    #   memory: 128Mi
-    # requests:
-    #   cpu: 100m
-    #   memory: 128Mi
-
-  spiffeHelper:
-    ## @param fetchCA.spiffeHelper.resources [object] Specify resources for the SPIFFE helper
-    resources: {}
-      # limits:
-      #   cpu: 100m
-      #   memory: 128Mi
-      # requests:
-      #   cpu: 100m
-      #   memory: 128Mi
-
-  ## @param fetchCA.nodeSelector [object] Specify node selector
-  nodeSelector: {}
-
-  ## @param fetchCA.tolerations [array] Specify tolerations
-  tolerations: []
-
-  ## @param fetchCA.affinity [object] Specify affinity
-  affinity: {}
-
-config:
-  ## @param config.resources [object] Specify resources
-  resources: {}
-    # limits:
-    #   cpu: 100m
-    #   memory: 128Mi
-    # requests:
-    #   cpu: 100m
-    #   memory: 128Mi
-
-  ## @param config.nodeSelector [object] Specify node selector
-  nodeSelector: {}
-
-  ## @param config.tolerations [array] Specify tolerations
-  tolerations: []
-
-  ## @param config.affinity [object] Specify affinity
-  affinity: {}

charts/spire-nested/Chart.yaml

@@ -3,8 +3,8 @@ name: spire-nested
 description: >
   A Helm chart for deploying the complete Spire stack including: spire-server, spire-agent, spiffe-csi-driver, spiffe-oidc-discovery-provider and spire-controller-manager.
 type: application
-version: 0.26.1
-appVersion: "1.12.4"
+version: 0.24.0
+appVersion: "1.11.0"
 keywords: ["spiffe", "spire", "spire-server", "spire-agent", "oidc", "spire-controller-manager"]
 home: https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spire
 sources:

charts/spire-nested/README.md

@@ -1,6 +1,6 @@
 # spire
 
-![Version: 0.26.1](https://img.shields.io/badge/Version-0.26.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.12.4](https://img.shields.io/badge/AppVersion-1.12.4-informational?style=flat-square)
+![Version: 0.24.0](https://img.shields.io/badge/Version-0.24.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.11.0](https://img.shields.io/badge/AppVersion-1.11.0-informational?style=flat-square)
 [![Development Phase](https://github.com/spiffe/spiffe/blob/main/.img/maturity/dev.svg)](https://github.com/spiffe/spiffe/blob/main/MATURITY.md#development)
 
 A Helm chart for deploying the complete Spire stack including: spire-server, spire-agent, spiffe-csi-driver, spiffe-oidc-discovery-provider and spire-controller-manager.
@@ -350,6 +350,6 @@ Now you can interact with the Spire agent socket from your own application. The
 | `external-spire-server.upstreamAuthority.spire.enabled`                                                            | Enable upstream SPIRE server                                                          | `true`                       |
 | `external-spire-server.upstreamAuthority.spire.upstreamDriver`                                                     | Use an upstream driver for authentication                                             | `upstream.csi.spiffe.io`     |
 | `external-spire-server.upstreamAuthority.spire.server.nameOverride`                                                | The name override setting of the root SPIRE server                                    | `root-server`                |
-| `external-spire-server.bundlePublisher.k8sConfigMap.enabled`                                                       | Enable local k8s bundle uploader                                                      | `false`                      |
+| `external-spire-server.notifier.k8sBundle.enabled`                                                                 | Enable local k8s bundle uploader                                                      | `false`                      |
 | `external-spire-server.nodeAttestor.k8sPSAT.enabled`                                                               | Enable PSAT k8s nodeattestor                                                          | `false`                      |
 | `external-spire-server.nodeAttestor.joinToken.enabled`                                                             | Enable the join_token nodeattestor                                                    | `true`                       |

charts/spire-nested/values.yaml

@@ -384,9 +384,9 @@ external-spire-server:
       server:
         ## @param external-spire-server.upstreamAuthority.spire.server.nameOverride The name override setting of the root SPIRE server
         nameOverride: root-server
-  bundlePublisher:
-    k8sConfigMap:
-      ## @param external-spire-server.bundlePublisher.k8sConfigMap.enabled Enable local k8s bundle uploader
+  notifier:
+    k8sBundle:
+      ## @param external-spire-server.notifier.k8sBundle.enabled Enable local k8s bundle uploader
       enabled: false
   nodeAttestor:
     k8sPSAT:

charts/spire/Chart.yaml

@@ -3,8 +3,8 @@ name: spire
 description: >
   A Helm chart for deploying the complete Spire stack including: spire-server, spire-agent, spiffe-csi-driver, spiffe-oidc-discovery-provider and spire-controller-manager.
 type: application
-version: 0.26.1
-appVersion: "1.12.4"
+version: 0.24.0
+appVersion: "1.11.0"
 keywords: ["spiffe", "spire", "spire-server", "spire-agent", "oidc", "spire-controller-manager"]
 home: https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spire
 sources:
@@ -55,18 +55,6 @@ dependencies:
     condition: tornjak-frontend.enabled
     repository: file://./charts/tornjak-frontend
     version: 0.1.0
-  - name: spike-keeper
-    condition: spike-keeper.enabled
-    repository: file://./charts/spike-keeper
-    version: 0.1.0
-  - name: spike-nexus
-    condition: spike-nexus.enabled
-    repository: file://./charts/spike-nexus
-    version: 0.1.0
-  - name: spike-pilot
-    condition: spike-pilot.enabled
-    repository: file://./charts/spike-pilot
-    version: 0.1.0
 annotations:
   artifacthub.io/category: security
   artifacthub.io/license: Apache-2.0

charts/spire/README.md

@@ -1,6 +1,6 @@
 # spire
 
-![Version: 0.26.1](https://img.shields.io/badge/Version-0.26.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.12.4](https://img.shields.io/badge/AppVersion-1.12.4-informational?style=flat-square)
+![Version: 0.24.0](https://img.shields.io/badge/Version-0.24.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.11.0](https://img.shields.io/badge/AppVersion-1.11.0-informational?style=flat-square)
 [![Development Phase](https://github.com/spiffe/spiffe/blob/main/.img/maturity/dev.svg)](https://github.com/spiffe/spiffe/blob/main/MATURITY.md#development)
 
 A Helm chart for deploying the complete Spire stack including: spire-server, spire-agent, spiffe-csi-driver, spiffe-oidc-discovery-provider and spire-controller-manager.
@@ -24,6 +24,11 @@ Preparing a production deployment requires a few steps.
 
 1. Save the following to your-values.yaml, ideally in your git repo.
 
+> [!NOTE]
+> Please note that `rancher/kubectl` image does not always correspond to the most
+> recent version of Kubernetes. In order to find the most up-to-date version,
+> please visit their [releases](https://github.com/rancher/kubectl/releases) page.
+
 ```yaml
 global:
   openshift: false # If running on openshift, set to true
@@ -40,6 +45,10 @@ global:
       country: ARPA
       organization: Example
       commonName: example.org
+# If rancher/kubectl doesn't have a version that matches your cluster, uncomment and update:
+#    tools:
+#       kubectl:
+#         tag: "v1.23.3"
 ```
 
 2. If you need a non default storageClass, append the following to the global.spire section and update:
@@ -79,11 +88,6 @@ kubectl delete crds clusterfederatedtrustdomains.spire.spiffe.io clusterspiffeid
 
 We only support upgrading one major/minor version at a time. Version skipping isn't supported. Please see <https://spiffe.io/docs/latest/spire-helm-charts-hardened-about/upgrading/> for details.
 
-### 0.26.X
-
-- The notifier.k8sBundle plugin has been deprecated in favor of bundlePublisher.k8sConfigMap. The only features it does not provide are the settings `apiServiceLabel` and `webhookLabel`. If you are using either of these two features, set the chart to use the notifier.k8sBundle plugin again, and let us know. We don't think anyone is using these features.
-- The default trust bundle format has been changed to `spiffe`. This switch should be transparent unless you ware fetching the bundle from the configmap manually, or have a nested setup and dont upgrade the root, then child clusters in short order.
-
 ### 0.24.X
 
 - You must upgrade [spire-crds](https://artifacthub.io/packages/helm/spiffe/spire-crds) to 0.5.0+ before performing this upgrade.
@@ -369,21 +373,3 @@ Now you can interact with the Spire agent socket from your own application. The
 | Name                       | Description                                                    | Value   |
 | -------------------------- | -------------------------------------------------------------- | ------- |
 | `tornjak-frontend.enabled` | Enables deployment of Tornjak frontend/UI (Not for production) | `false` |
-
-### SPIKE Keeper parameters
-
-| Name                   | Description                                             | Value   |
-| ---------------------- | ------------------------------------------------------- | ------- |
-| `spike-keeper.enabled` | Enables deployment of SPIKE Keeper (Not for production) | `false` |
-
-### SPIKE Nexus parameters
-
-| Name                  | Description                                            | Value   |
-| --------------------- | ------------------------------------------------------ | ------- |
-| `spike-nexus.enabled` | Enables deployment of SPIKE Nexus (Not for production) | `false` |
-
-### SPIKE Pilot parameters
-
-| Name                  | Description                                            | Value   |
-| --------------------- | ------------------------------------------------------ | ------- |
-| `spike-pilot.enabled` | Enables deployment of SPIKE Pilot (Not for production) | `false` |

charts/spire/charts/spiffe-csi-driver/Chart.yaml

@@ -3,7 +3,7 @@ name: spiffe-csi-driver
 description: A Helm chart to install the SPIFFE CSI driver.
 type: application
 version: 0.1.0
-appVersion: "0.2.7"
+appVersion: "0.2.3"
 keywords: ["spiffe", "csi-driver"]
 home: https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spire
 sources:

charts/spire/charts/spiffe-csi-driver/README.md

@@ -1,6 +1,6 @@
 # spiffe-csi-driver
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.7](https://img.shields.io/badge/AppVersion-0.2.7-informational?style=flat-square)
+![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.3](https://img.shields.io/badge/AppVersion-0.2.3-informational?style=flat-square)
 
 A Helm chart to install the SPIFFE CSI driver.
 
@@ -33,7 +33,6 @@ A Helm chart to install the SPIFFE CSI driver.
 | `image.pullPolicy`                            | The image pull policy                                                                                                                                                    | `IfNotPresent`                              |
 | `image.tag`                                   | Overrides the image tag whose default is the chart appVersion                                                                                                            | `""`                                        |
 | `resources`                                   | Resource requests and limits for spiffe-csi-driver                                                                                                                       | `{}`                                        |
-| `extraEnvVars`                                | Extra environment variables to be added to the spiffe-csi-driver container                                                                                               | `[]`                                        |
 | `healthChecks.port`                           | The healthcheck port for spiffe-csi-driver                                                                                                                               | `9809`                                      |
 | `updateStrategy.type`                         | The update strategy to use to replace existing DaemonSet pods with new pods. Can be RollingUpdate or OnDelete.                                                           | `RollingUpdate`                             |
 | `updateStrategy.rollingUpdate.maxUnavailable` | Max unavailable pods during update. Can be a number or a percentage.                                                                                                     | `1`                                         |
@@ -62,7 +61,6 @@ A Helm chart to install the SPIFFE CSI driver.
 | `nodeDriverRegistrar.image.pullPolicy`        | The image pull policy                                                                                                                                                    | `IfNotPresent`                              |
 | `nodeDriverRegistrar.image.tag`               | Overrides the image tag                                                                                                                                                  | `v2.9.4`                                    |
 | `nodeDriverRegistrar.resources`               | Resource requests and limits for CSI driver pods                                                                                                                         | `{}`                                        |
-| `nodeDriverRegistrar.extraEnvVars`            | Extra environment variables to be added to the nodeDriverRegistrar container                                                                                             | `[]`                                        |
 | `agentSocketPath`                             | The unix socket path to the spire-agent                                                                                                                                  | `/run/spire/agent-sockets/spire-agent.sock` |
 | `kubeletPath`                                 | Path to kubelet file                                                                                                                                                     | `/var/lib/kubelet`                          |
 | `priorityClassName`                           | Priority class assigned to daemonset pods. Can be auto set with global.recommendations.priorityClassName.                                                                | `""`                                        |

charts/spire/charts/spiffe-csi-driver/templates/daemonset.yaml

@@ -90,9 +90,6 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
-          {{- with .Values.extraEnvVars }}
-          {{- toYaml . | nindent 12 }}
-          {{- end }}
           volumeMounts:
             # The volume containing the SPIRE agent socket. The SPIFFE CSI
             # driver will mount this directory into containers.
@@ -126,10 +123,6 @@ spec:
             "-kubelet-registration-path", "{{ .Values.kubeletPath }}/plugins/{{ .Values.pluginName }}/csi.sock",
             "-health-port", "{{ .Values.healthChecks.port }}"
           ]
-          env:
-          {{- with .Values.nodeDriverRegistrar.extraEnvVars }}
-          {{- toYaml . | nindent 12 }}
-          {{- end }}
           volumeMounts:
             # The registrar needs access to the SPIFFE CSI driver socket
             - mountPath: /spiffe-csi

charts/spire/charts/spiffe-csi-driver/values.yaml

@@ -33,9 +33,6 @@ resources: {}
   #   cpu: 100m
   #   memory: 64Mi
 
-## @param extraEnvVars [array] Extra environment variables to be added to the spiffe-csi-driver container
-extraEnvVars: []
-
 healthChecks:
   ## @param healthChecks.port The healthcheck port for spiffe-csi-driver
   port: 9809
@@ -139,8 +136,6 @@ nodeDriverRegistrar:
     # limits:
     #   cpu: 100m
     #   memory: 64Mi
-  ## @param nodeDriverRegistrar.extraEnvVars [array] Extra environment variables to be added to the nodeDriverRegistrar container
-  extraEnvVars: []
 
 ## @param agentSocketPath The unix socket path to the spire-agent
 agentSocketPath: /run/spire/agent-sockets/spire-agent.sock

charts/spire/charts/spiffe-oidc-discovery-provider/Chart.yaml

@@ -3,7 +3,7 @@ name: spiffe-oidc-discovery-provider
 description: A Helm chart to install the SPIFFE OIDC discovery provider.
 type: application
 version: 0.1.0
-appVersion: "1.12.4"
+appVersion: "1.11.0"
 keywords: ["spiffe", "oidc"]
 home: https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spire
 sources:

charts/spire/charts/spiffe-oidc-discovery-provider/README.md

@@ -29,8 +29,6 @@ A Helm chart to install the SPIFFE OIDC discovery provider.
 | ----------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------- |
 | `agentSocketName`                                     | The name of the spire-agent unix socket                                                                                                                                                                                                | `spire-agent.sock`                                                               |
 | `csiDriverName`                                       | The csi driver to use                                                                                                                                                                                                                  | `csi.spiffe.io`                                                                  |
-| `bundleSource`                                        | Configure where to fetch the trust bundle from. Must be CSI or ConfigMap.                                                                                                                                                              | `CSI`                                                                            |
-| `bundleConfigMap`                                     | ConfigMap name for SPIRE bundle when bundleSource is ConfigMap                                                                                                                                                                         | `spire-bundle`                                                                   |
 | `replicaCount`                                        | Replica count                                                                                                                                                                                                                          | `1`                                                                              |
 | `namespaceOverride`                                   | Namespace override                                                                                                                                                                                                                     | `""`                                                                             |
 | `annotations`                                         | Annotations for the deployment                                                                                                                                                                                                         | `{}`                                                                             |
@@ -38,12 +36,10 @@ A Helm chart to install the SPIFFE OIDC discovery provider.
 | `image.repository`                                    | The repository within the registry                                                                                                                                                                                                     | `spiffe/oidc-discovery-provider`                                                 |
 | `image.pullPolicy`                                    | The image pull policy                                                                                                                                                                                                                  | `IfNotPresent`                                                                   |
 | `image.tag`                                           | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                          | `""`                                                                             |
-| `expandEnv`                                           | Set to true to enable environment variable substitution of config file options                                                                                                                                                         | `false`                                                                          |
-| `extraEnv`                                            | Extra environment variables to add to the spiffe oidc discovery provider                                                                                                                                                               | `[]`                                                                             |
 | `spiffeHelper.image.registry`                         | The OCI registry to pull the image from                                                                                                                                                                                                | `ghcr.io`                                                                        |
 | `spiffeHelper.image.repository`                       | The repository within the registry                                                                                                                                                                                                     | `spiffe/spiffe-helper`                                                           |
 | `spiffeHelper.image.pullPolicy`                       | The image pull policy                                                                                                                                                                                                                  | `IfNotPresent`                                                                   |
-| `spiffeHelper.image.tag`                              | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                          | `0.10.1`                                                                         |
+| `spiffeHelper.image.tag`                              | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                          | `0.8.0`                                                                          |
 | `spiffeHelper.resources`                              | Resource requests and limits                                                                                                                                                                                                           | `{}`                                                                             |
 | `resources`                                           | Resource requests and limits                                                                                                                                                                                                           | `{}`                                                                             |
 | `service.type`                                        | Service type                                                                                                                                                                                                                           | `ClusterIP`                                                                      |
@@ -73,13 +69,12 @@ A Helm chart to install the SPIFFE OIDC discovery provider.
 | `insecureScheme.nginx.image.registry`                 | The OCI registry to pull the image from. Only used when TLS is disabled.                                                                                                                                                               | `docker.io`                                                                      |
 | `insecureScheme.nginx.image.repository`               | The repository within the registry. Only used when TLS is disabled.                                                                                                                                                                    | `nginxinc/nginx-unprivileged`                                                    |
 | `insecureScheme.nginx.image.pullPolicy`               | The image pull policy.  Only used when TLS is disabled.                                                                                                                                                                                | `IfNotPresent`                                                                   |
-| `insecureScheme.nginx.image.tag`                      | Overrides the image tag whose default is the chart appVersion. Only used when TLS is disabled.                                                                                                                                         | `1.29.0-alpine`                                                                  |
+| `insecureScheme.nginx.image.tag`                      | Overrides the image tag whose default is the chart appVersion. Only used when TLS is disabled.                                                                                                                                         | `1.27.2-alpine`                                                                  |
 | `insecureScheme.nginx.ipMode`                         | IP modes supported by the cluster. Must be one of [ipv4, ipv6, both]                                                                                                                                                                   | `both`                                                                           |
 | `insecureScheme.nginx.resources`                      | Resource requests and limits                                                                                                                                                                                                           | `{}`                                                                             |
 | `jwtIssuer`                                           | Path to JWT issuer. Defaults to oidc-discovery.$trustDomain if unset                                                                                                                                                                   | `""`                                                                             |
 | `config.logLevel`                                     | The log level, valid values are "debug", "info", "warn", and "error"                                                                                                                                                                   | `info`                                                                           |
 | `config.jwtDomain`                                    | The JWT domain. Defaults to oidc-discovery.$jwtIssuer URL-parsed host if unset                                                                                                                                                         | `""`                                                                             |
-| `config.jwksUri`                                      | The JWKS URI                                                                                                                                                                                                                           | `""`                                                                             |
 | `config.additionalDomains`                            | Add additional domains that can be used for oidc discovery                                                                                                                                                                             | `[]`                                                                             |
 | `imagePullSecrets`                                    | Image pull secret names                                                                                                                                                                                                                | `[]`                                                                             |
 | `nameOverride`                                        | Name override                                                                                                                                                                                                                          | `""`                                                                             |
@@ -106,7 +101,7 @@ A Helm chart to install the SPIFFE OIDC discovery provider.
 | `telemetry.prometheus.nginxExporter.image.registry`   | The OCI registry to pull the image from                                                                                                                                                                                                | `docker.io`                                                                      |
 | `telemetry.prometheus.nginxExporter.image.repository` | The repository within the registry                                                                                                                                                                                                     | `nginx/nginx-prometheus-exporter`                                                |
 | `telemetry.prometheus.nginxExporter.image.pullPolicy` | The image pull policy                                                                                                                                                                                                                  | `IfNotPresent`                                                                   |
-| `telemetry.prometheus.nginxExporter.image.tag`        | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                          | `1.4.2`                                                                          |
+| `telemetry.prometheus.nginxExporter.image.tag`        | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                          | `1.3.0`                                                                          |
 | `telemetry.prometheus.nginxExporter.resources`        | Resource requests and limits                                                                                                                                                                                                           | `{}`                                                                             |
 | `ingress.enabled`                                     | Flag to enable ingress                                                                                                                                                                                                                 | `false`                                                                          |
 | `ingress.className`                                   | Ingress class name                                                                                                                                                                                                                     | `""`                                                                             |
@@ -122,15 +117,15 @@ A Helm chart to install the SPIFFE OIDC discovery provider.
 | `tests.bash.image.registry`                           | The OCI registry to pull the image from                                                                                                                                                                                                | `cgr.dev`                                                                        |
 | `tests.bash.image.repository`                         | The repository within the registry                                                                                                                                                                                                     | `chainguard/bash`                                                                |
 | `tests.bash.image.pullPolicy`                         | The image pull policy                                                                                                                                                                                                                  | `IfNotPresent`                                                                   |
-| `tests.bash.image.tag`                                | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                          | `latest@sha256:330ad2ea11cf3018a331326fb08e44cedd0c0c604cfbfcff32b81272460bb679` |
+| `tests.bash.image.tag`                                | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                          | `latest@sha256:a5cd47a3caf0668c48c6ad4bb66436cab40aa335634f3b5740ffd2a0c39770b2` |
 | `tests.toolkit.image.registry`                        | The OCI registry to pull the image from                                                                                                                                                                                                | `cgr.dev`                                                                        |
 | `tests.toolkit.image.repository`                      | The repository within the registry                                                                                                                                                                                                     | `chainguard/min-toolkit-debug`                                                   |
 | `tests.toolkit.image.pullPolicy`                      | The image pull policy                                                                                                                                                                                                                  | `IfNotPresent`                                                                   |
-| `tests.toolkit.image.tag`                             | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                          | `latest@sha256:f662d2b8c7c47e6d29c31b1bc8dbd039770d6186295bbc88bd8f540ca8ec3b53` |
+| `tests.toolkit.image.tag`                             | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                          | `latest@sha256:424ac4637dac08a4594643b548d9af10144dcd6360b4b319a4c143841bf0bfee` |
 | `tests.step.image.registry`                           | The OCI registry to pull the image from                                                                                                                                                                                                | `docker.io`                                                                      |
 | `tests.step.image.repository`                         | The repository within the registry                                                                                                                                                                                                     | `smallstep/step-cli`                                                             |
 | `tests.step.image.pullPolicy`                         | The image pull policy                                                                                                                                                                                                                  | `IfNotPresent`                                                                   |
-| `tests.step.image.tag`                                | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                          | `0.28.7`                                                                         |
+| `tests.step.image.tag`                                | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                          | `0.27.5`                                                                         |
 | `tests.busybox.image.registry`                        | The OCI registry to pull the image from                                                                                                                                                                                                | `""`                                                                             |
 | `tests.busybox.image.repository`                      | The repository within the registry                                                                                                                                                                                                     | `busybox`                                                                        |
 | `tests.busybox.image.pullPolicy`                      | The image pull policy                                                                                                                                                                                                                  | `IfNotPresent`                                                                   |
@@ -139,7 +134,7 @@ A Helm chart to install the SPIFFE OIDC discovery provider.
 | `tests.agent.image.repository`                        | The repository within the registry                                                                                                                                                                                                     | `spiffe/spire-agent`                                                             |
 | `tests.agent.image.pullPolicy`                        | The image pull policy                                                                                                                                                                                                                  | `IfNotPresent`                                                                   |
 | `tests.agent.image.tag`                               | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                          | `""`                                                                             |
-| `tools.kubectl.image.registry`                        | The OCI registry to pull the image from                                                                                                                                                                                                | `registry.k8s.io`                                                                |
-| `tools.kubectl.image.repository`                      | The repository within the registry                                                                                                                                                                                                     | `kubectl`                                                                        |
+| `tools.kubectl.image.registry`                        | The OCI registry to pull the image from                                                                                                                                                                                                | `docker.io`                                                                      |
+| `tools.kubectl.image.repository`                      | The repository within the registry                                                                                                                                                                                                     | `rancher/kubectl`                                                                |
 | `tools.kubectl.image.pullPolicy`                      | The image pull policy                                                                                                                                                                                                                  | `IfNotPresent`                                                                   |
 | `tools.kubectl.image.tag`                             | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                          | `""`                                                                             |

charts/spire/charts/spiffe-oidc-discovery-provider/templates/configmap.yaml

@@ -1,6 +1,3 @@
-{{- if and (ne .Values.bundleSource "ConfigMap") (ne .Values.bundleSource "CSI") }}
-{{-   fail "Bundle source must be CSI or ConfigmMap" }}
-{{- end }}
 {{- $tlsCount := 0 }}
 {{- if and .Values.enabled .Values.tls.spire.enabled }}
 {{-   $tlsCount = add $tlsCount 1 }}
@@ -43,18 +40,9 @@ serving_cert_file:
   addr: ':8443'
 {{- end }}
 
-{{- if .Values.config.jwksUri}}
-jwks_uri: {{ .Values.config.jwksUri | quote }}
-{{- end }}
-
-{{- if eq .Values.bundleSource "ConfigMap" }}
-file:
-  path: /bundle/bundle.spiffe
-{{- else }}
 workload_api:
   socket_path: {{ include "spiffe-oidc-discovery-provider.workload-api-socket-path" . | quote }}
   trust_domain: {{ include "spire-lib.trust-domain" . | quote }}
-{{- end }}
 
 health_checks:
   bind_port: "8008"

charts/spire/charts/spiffe-oidc-discovery-provider/templates/deployment.yaml

@@ -71,13 +71,6 @@ spec:
           args:
             - -config
             - /run/spire/oidc/config/oidc-discovery-provider.conf
-            {{- if .Values.expandEnv }}
-            - -expandEnv
-            {{- end }}
-          {{- with .Values.extraEnv }}
-          env:
-          {{- . | toYaml | nindent 12 }}
-          {{- end }}
           ports:
             - containerPort: 8008
               name: healthz
@@ -86,15 +79,9 @@ spec:
               name: https
           {{- end }}
           volumeMounts:
-            {{- if eq .Values.bundleSource "ConfigMap" }}
-            - name: spiffe-bundle
-              mountPath: /bundle
-              readOnly: true
-            {{- else }}
             - name: spiffe-workload-api
               mountPath: {{ include "spiffe-oidc-discovery-provider.workload-api-socket-path" . | dir }}
               readOnly: true
-            {{- end }}
             - name: spire-oidc-sockets
               mountPath: /run/spire/oidc-sockets
               readOnly: false
@@ -177,17 +164,10 @@ spec:
         {{- end }}
         {{- end }}
       volumes:
-        {{- if or .Values.tls.spire.enabled (eq .Values.bundleSource "CSI") }}
         - name: spiffe-workload-api
           csi:
             driver: "{{ .Values.csiDriverName }}"
             readOnly: true
-        {{- end }}
-        {{- if eq .Values.bundleSource "ConfigMap" }}
-        - name: spiffe-bundle
-          configMap:
-            name: {{ include "spire-lib.bundle-configmap" . }}
-        {{- end }}
         - name: spire-oidc-sockets
           emptyDir: {}
         - name: spire-oidc-config

charts/spire/charts/spiffe-oidc-discovery-provider/values.yaml

@@ -11,12 +11,6 @@ agentSocketName: spire-agent.sock
 ## @param csiDriverName The csi driver to use
 csiDriverName: csi.spiffe.io
 
-## @param bundleSource Configure where to fetch the trust bundle from. Must be CSI or ConfigMap.
-bundleSource: CSI
-
-## @param bundleConfigMap ConfigMap name for SPIRE bundle when bundleSource is ConfigMap
-bundleConfigMap: spire-bundle
-
 ## @param replicaCount Replica count
 replicaCount: 1
 
@@ -37,12 +31,6 @@ image:
   pullPolicy: IfNotPresent
   tag: ""
 
-## @param expandEnv Set to true to enable environment variable substitution of config file options
-expandEnv: false
-
-## @param extraEnv [array] Extra environment variables to add to the spiffe oidc discovery provider
-extraEnv: []
-
 spiffeHelper:
   image:
     ## @param spiffeHelper.image.registry The OCI registry to pull the image from
@@ -53,7 +41,7 @@ spiffeHelper:
     registry: ghcr.io
     repository: spiffe/spiffe-helper
     pullPolicy: IfNotPresent
-    tag: 0.10.1
+    tag: 0.8.0
   ## @param spiffeHelper.resources [object] Resource requests and limits
   resources: {}
 
@@ -176,7 +164,7 @@ insecureScheme:
       registry: docker.io
       repository: nginxinc/nginx-unprivileged
       pullPolicy: IfNotPresent
-      tag: 1.29.0-alpine
+      tag: 1.27.2-alpine
     ## @param insecureScheme.nginx.ipMode IP modes supported by the cluster. Must be one of [ipv4, ipv6, both]
     ipMode: both
     ## @param insecureScheme.nginx.resources Resource requests and limits
@@ -200,8 +188,6 @@ config:
   logLevel: info
   ## @param config.jwtDomain [string] The JWT domain. Defaults to oidc-discovery.$jwtIssuer URL-parsed host if unset
   jwtDomain: ""
-  ## @param config.jwksUri [string] The JWKS URI
-  jwksUri: ""
   ## @param config.additionalDomains [array] Add additional domains that can be used for oidc discovery
   additionalDomains: []
   # - localhost
@@ -280,7 +266,7 @@ telemetry:
         registry: docker.io
         repository: nginx/nginx-prometheus-exporter
         pullPolicy: IfNotPresent
-        tag: "1.4.2"
+        tag: "1.3.0"
 
       ## @param telemetry.prometheus.nginxExporter.resources [object] Resource requests and limits
       resources: {}
@@ -346,7 +332,7 @@ tests:
       registry: cgr.dev
       repository: chainguard/bash
       pullPolicy: IfNotPresent
-      tag: latest@sha256:330ad2ea11cf3018a331326fb08e44cedd0c0c604cfbfcff32b81272460bb679
+      tag: latest@sha256:a5cd47a3caf0668c48c6ad4bb66436cab40aa335634f3b5740ffd2a0c39770b2
 
   toolkit:
     ## @param tests.toolkit.image.registry The OCI registry to pull the image from
@@ -358,7 +344,7 @@ tests:
       registry: cgr.dev
       repository: chainguard/min-toolkit-debug
       pullPolicy: IfNotPresent
-      tag: latest@sha256:f662d2b8c7c47e6d29c31b1bc8dbd039770d6186295bbc88bd8f540ca8ec3b53
+      tag: latest@sha256:424ac4637dac08a4594643b548d9af10144dcd6360b4b319a4c143841bf0bfee
 
   step:
     ## @param tests.step.image.registry The OCI registry to pull the image from
@@ -370,7 +356,7 @@ tests:
       registry: "docker.io"
       repository: smallstep/step-cli
       pullPolicy: IfNotPresent
-      tag: 0.28.7
+      tag: 0.27.5
 
   busybox:
     ## @param tests.busybox.image.registry The OCI registry to pull the image from
@@ -404,7 +390,7 @@ tools:
     ## @param tools.kubectl.image.tag Overrides the image tag whose default is the chart appVersion
     ##
     image:
-      registry: registry.k8s.io
-      repository: kubectl
+      registry: docker.io
+      repository: rancher/kubectl
       pullPolicy: IfNotPresent
       tag: ""

charts/spire/charts/spike-keeper/Chart.yaml

@@ -1,13 +0,0 @@
-apiVersion: v2
-name: spike-keeper
-description: A Helm chart to deploy SPIKE Keeper
-type: application
-version: 0.1.0
-appVersion: "0.4.2"
-home: https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spire
-sources:
-  - https://github.com/spiffe/spike
-icon: https://spike.ist/assets/spike-banner.png
-maintainers:
-  - name: kfox1111
-    email: Kevin.Fox@pnnl.gov

charts/spire/charts/spike-keeper/README.md

@@ -1,72 +0,0 @@
-# spike-keeper
-
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.4.1](https://img.shields.io/badge/AppVersion-v0.4.1-informational?style=flat-square)
-[![Development Phase](https://github.com/spiffe/spiffe/blob/main/.img/maturity/dev.svg)](https://github.com/spiffe/spiffe/blob/main/MATURITY.md#development)
-
-A Helm chart to deploy spike keepers
-
-**Homepage:** <https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spire>
-
-## Version support
-
-> [!Note]
-> This Chart is still in development and still subject to change the API (`values.yaml`).
-> Until we reach a `1.0.0` version of the chart we can't guarantee backwards compatibility although
-> we do aim for as much stability as possible.
-
-| Dependency | Supported Versions |
-|:-----------|:-------------------|
-| Helm       | `3.x`              |
-
-## Source Code
-
-* <https://github.com/spiffe/spike>
-
-<!-- The parameters section is generated using helm-docs.sh and should not be edited by hand. -->
-
-## Parameters
-
-### Chart parameters
-
-| Name                               | Description                                                                                                                                                                                                                             | Value                 |
-| ---------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- |
-| `image.registry`                   | The OCI registry to pull the image from                                                                                                                                                                                                 | `ghcr.io`             |
-| `image.repository`                 | The repository within the registry                                                                                                                                                                                                      | `spiffe/spike-keeper` |
-| `image.pullPolicy`                 | The image pull policy                                                                                                                                                                                                                   | `IfNotPresent`        |
-| `image.tag`                        | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                           | `""`                  |
-| `replicas`                         | The number of keepers to launch                                                                                                                                                                                                         | `3`                   |
-| `trustRoot.nexus`                  | Override which trustRoot Nexus is in                                                                                                                                                                                                    | `""`                  |
-| `logLevel`                         | The log level, valid values are "debug", "info", "warn", and "error"                                                                                                                                                                    | `debug`               |
-| `agentSocketName`                  | The name of the spire-agent unix socket                                                                                                                                                                                                 | `spire-agent.sock`    |
-| `csiDriverName`                    | The csi driver to use                                                                                                                                                                                                                   | `csi.spiffe.io`       |
-| `imagePullSecrets`                 | Pull secrets for images                                                                                                                                                                                                                 | `[]`                  |
-| `nameOverride`                     | Name override                                                                                                                                                                                                                           | `""`                  |
-| `namespaceOverride`                | Namespace override                                                                                                                                                                                                                      | `""`                  |
-| `fullnameOverride`                 | Fullname override                                                                                                                                                                                                                       | `""`                  |
-| `serviceAccount.create`            | Specifies whether a service account should be created                                                                                                                                                                                   | `true`                |
-| `serviceAccount.annotations`       | Annotations to add to the service account                                                                                                                                                                                               | `{}`                  |
-| `serviceAccount.name`              | The name of the service account to use. If not set and create is true, a name is generated.                                                                                                                                             | `""`                  |
-| `labels`                           | Labels for pods                                                                                                                                                                                                                         | `{}`                  |
-| `podSecurityContext`               | Pod security context                                                                                                                                                                                                                    | `{}`                  |
-| `securityContext`                  | Security context                                                                                                                                                                                                                        | `{}`                  |
-| `service.type`                     | Service type                                                                                                                                                                                                                            | `ClusterIP`           |
-| `service.port`                     | Service port                                                                                                                                                                                                                            | `443`                 |
-| `service.annotations`              | Annotations for service resource                                                                                                                                                                                                        | `{}`                  |
-| `nodeSelector`                     | (Optional) Select specific nodes to run on.                                                                                                                                                                                             | `{}`                  |
-| `affinity`                         | Affinity rules                                                                                                                                                                                                                          | `{}`                  |
-| `tolerations`                      | List of tolerations                                                                                                                                                                                                                     | `[]`                  |
-| `topologySpreadConstraints`        | List of topology spread constraints for resilience                                                                                                                                                                                      | `[]`                  |
-| `startupProbe.enabled`             | Enable startupProbe                                                                                                                                                                                                                     | `true`                |
-| `startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe                                                                                                                                                                                                  | `5`                   |
-| `startupProbe.periodSeconds`       | Period seconds for startupProbe                                                                                                                                                                                                         | `10`                  |
-| `startupProbe.timeoutSeconds`      | Timeout seconds for startupProbe                                                                                                                                                                                                        | `5`                   |
-| `startupProbe.failureThreshold`    | Failure threshold count for startupProbe                                                                                                                                                                                                | `6`                   |
-| `startupProbe.successThreshold`    | Success threshold count for startupProbe                                                                                                                                                                                                | `1`                   |
-| `ingress.enabled`                  | Flag to enable ingress                                                                                                                                                                                                                  | `false`               |
-| `ingress.className`                | Ingress class name                                                                                                                                                                                                                      | `""`                  |
-| `ingress.controllerType`           | Specify what type of ingress controller you're using to add the necessary annotations accordingly. If blank, auto-detection is attempted. If other, no annotations will be added. Must be one of [ingress-nginx, openshift, other, ""]. | `""`                  |
-| `ingress.annotations`              | Annotations                                                                                                                                                                                                                             | `{}`                  |
-| `ingress.host`                     | Host name for the ingress. If no '.' in host, trustDomain is automatically appended. The rest of the rules will be autogenerated. For more customizability, use hosts[] instead.                                                        | `keeper`              |
-| `ingress.tlsSecret`                | Secret that has the certs. If blank will use default certs. Used with host var.                                                                                                                                                         | `""`                  |
-| `ingress.hosts`                    | Host paths for ingress object. If empty, rules will be built based on the host var.                                                                                                                                                     | `[]`                  |
-| `ingress.tls`                      | Secrets containing TLS certs to enable https on ingress. If empty, rules will be built based on the host and tlsSecret vars.                                                                                                            | `[]`                  |

charts/spire/charts/spike-keeper/templates/NOTES.txt

@@ -1 +0,0 @@
-Installed {{ .Chart.Name }}…

charts/spire/charts/spike-keeper/templates/_helpers.tpl

@@ -1,83 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "spike-keeper.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "spike-keeper.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Allow the release namespace to be overridden for multi-namespace deployments in combined charts
-*/}}
-{{- define "spike-keeper.namespace" -}}
-  {{- if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else if and (dig "spire" "recommendations" "enabled" false .Values.global) (dig "spire" "recommendations" "namespaceLayout" true .Values.global) }}
-    {{- if ne (len (dig "spire" "namespaces" "server" "name" "" .Values.global)) 0 }}
-      {{- .Values.global.spire.namespaces.server.name }}
-    {{- else }}
-      {{- printf "spire-server" }}
-    {{- end }}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "spike-keeper.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "spike-keeper.labels" -}}
-helm.sh/chart: {{ include "spike-keeper.chart" . }}
-{{ include "spike-keeper.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "spike-keeper.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "spike-keeper.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "spike-keeper.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "spike-keeper.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
-{{- define "spike-keeper.workload-api-socket-path" -}}
-{{- printf "/spiffe-workload-api/%s" .Values.agentSocketName }}
-{{- end }}

charts/spire/charts/spike-keeper/templates/ingress.yaml

@@ -1,44 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{ $root := . }}
-{{- $ingressControllerType := include "spire-lib.ingress-controller-type" (dict "global" .Values.global "ingress" .Values.ingress) }}
-{{- $fullName := include "spike-keeper.fullname" . -}}
-{{- $tlsSection := true }}
-{{- $annotations := deepCopy .Values.ingress.annotations }}
-{{- if eq $ingressControllerType "ingress-nginx" }}
-{{-   $_ := set $annotations "nginx.ingress.kubernetes.io/ssl-redirect" "true" }}
-{{-   $_ := set $annotations "nginx.ingress.kubernetes.io/force-ssl-redirect" "true" }}
-{{-   $_ := set $annotations "nginx.ingress.kubernetes.io/backend-protocol" "HTTPS" }}
-{{-   $_ := set $annotations "nginx.ingress.kubernetes.io/ssl-passthrough" "true" }}
-{{- else if eq $ingressControllerType "openshift" }}
-{{-   $path = "" }}
-{{-   $_ := set $annotations "route.openshift.io/termination" "passthrough" }}
-{{-   $tlsSection = false }}
-{{- end }}
-{{ $last := sub (.Values.replicas | int) 1 | int }}
-{{ range (seq 0 ($last) | toString | split " ") }}
-{{ $i := . }}
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}-{{ $i }}
-  namespace: {{ include "spike-keeper.namespace" $root }}
-  labels:
-    {{ include "spike-keeper.labels" $root | nindent 4}}
-  {{- with $annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- $host := $root.Values.ingress.host }}
-  {{- if contains "." $host }}
-  {{-   $hostParts := regexSplit "[.]" $host 2 }}
-  {{-   $host = printf "%s-%s.%s" (index $hostParts 0) $i (index $hostParts 1) }}
-  {{- else }}
-  {{-   $host = printf "%s-%s" $host $i }}
-  {{- end }}
-  {{ $ingress := deepCopy $root.Values.ingress }}
-  {{ $_ :=  set $ingress "host" $host }}
-  {{ include "spire-lib.ingress-spec" (dict "ingress" $ingress "svcName" (printf "%s-%s" $fullName $i) "port" $root.Values.service.port "path" "/" "pathType" "Prefix" "tlsSection" $tlsSection "Values" $root.Values) | nindent 2 }}
-{{- end }}
-{{- end }}

charts/spire/charts/spike-keeper/templates/service.yaml

@@ -1,48 +0,0 @@
-{{ $root := . }}
-{{ $last := sub (.Values.replicas | int) 1 | int }}
-{{ range (seq 0 ($last) | toString | split " ") }}
-{{ $i := . }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  namespace: {{ include "spike-keeper.namespace" $root }}
-  name: {{ include "spike-keeper.fullname" $root }}-{{ $i }}
-  {{- with $root.Values.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels:
-    apps.kubernetes.io/pod-index: {{ $i | quote }}
-    {{- include "spike-keeper.labels" $root | nindent 4 }}
-spec:
-  type: {{ $root.Values.service.type }}
-  selector:
-    apps.kubernetes.io/pod-index: {{ $i | quote }}
-    {{- include "spike-keeper.selectorLabels" $root | nindent 4 }}
-  ports:
-    - name: {{ include "spike-keeper.fullname" $root }}
-      port: {{ $root.Values.service.port }}
-      targetPort: http
-{{ end }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  namespace: {{ include "spike-keeper.namespace" $root }}
-  name: {{ include "spike-keeper.fullname" $root }}-headless
-  {{- with $root.Values.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels:
-    {{- include "spike-keeper.labels" $root | nindent 4 }}
-spec:
-  type: {{ $root.Values.service.type }}
-  clusterIP: None
-  selector:
-    {{- include "spike-keeper.selectorLabels" $root | nindent 4 }}
-  ports:
-    - name: {{ include "spike-keeper.fullname" $root }}
-      port: {{ $root.Values.service.port }}
-      targetPort: http

charts/spire/charts/spike-keeper/templates/serviceaccount.yaml

@@ -1,13 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "spike-keeper.serviceAccountName" . }}
-  namespace: {{ include "spike-keeper.namespace" . }}
-  labels:
-    {{- include "spike-keeper.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}

charts/spire/charts/spike-keeper/templates/statefulset.yaml

@@ -1,84 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: {{ include "spike-keeper.fullname" . }}
-  namespace: {{ include "spike-keeper.namespace" . }}
-  labels:
-    {{- include "spike-keeper.labels" . | nindent 4 }}
-spec:
-  serviceName: {{ include "spike-keeper.fullname" . }}-headless
-  replicas: {{ .Values.replicas }}
-  selector:
-    matchLabels:
-      {{- include "spike-keeper.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      labels:
-        {{- include "spike-keeper.selectorLabels" . | nindent 8 }}
-        release: {{ .Release.Name }}
-        release-namespace: {{ .Release.Namespace }}
-        component: spike-keeper
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "spike-keeper.serviceAccountName" . }}
-      securityContext:
-        {{- include "spire-lib.podsecuritycontext" . | nindent 8 }}
-      containers:
-        - name:  {{ include "spike-keeper.fullname" . }}
-          image: {{ template "spire-lib.image" (dict "appVersion" $.Chart.AppVersion "image" .Values.image "global" .Values.global "ubi" true) }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          securityContext:
-            {{- include "spire-lib.securitycontext" . | nindent 12 }}
-          ports:
-            - name: http
-              containerPort: 8443
-              protocol: TCP
-          env:
-            - name: SPIFFE_ENDPOINT_SOCKET
-              value: unix://{{ include "spike-keeper.workload-api-socket-path" . }}
-            - name: SPIKE_SYSTEM_LOG_LEVEL
-              value: {{ .Values.logLevel | upper }}
-            - name: SPIKE_TRUST_ROOT
-              value: {{ include "spire-lib.trust-domain" . }}
-            - name: SPIKE_TRUST_ROOT_NEXUS
-              value: {{if eq .Values.trustRoot.nexus "" }}{{ include "spire-lib.trust-domain" . }}{{ else }}{{.Values.trustRoot.nexus }}{{ end }}
-            - name: SPIKE_KEEPER_TLS_PORT
-              value: ":8443"
-          {{- if .Values.startupProbe.enabled }}
-          startupProbe:
-            tcpSocket:
-              port: 8443
-            failureThreshold: {{ .Values.startupProbe.failureThreshold }}
-            initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.startupProbe.periodSeconds }}
-            successThreshold: {{ .Values.startupProbe.successThreshold }}
-            timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds }}
-          {{- end }}
-          volumeMounts:
-            - name: spiffe-workload-api
-              mountPath: {{ include "spike-keeper.workload-api-socket-path" . | dir }}
-              readOnly: true
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.topologySpreadConstraints }}
-      topologySpreadConstraints:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      volumes:
-        - name: spiffe-workload-api
-          csi:
-            driver: "{{ .Values.csiDriverName }}"
-            readOnly: true

charts/spire/charts/spike-keeper/values.yaml

@@ -1,139 +0,0 @@
-# Default configuration for SPIKE Keeper
-# SPDX-License-Identifier: APACHE-2.0
-
-## @skip global
-global: {}
-
-## @section Chart parameters
-##
-## @param image.registry The OCI registry to pull the image from
-## @param image.repository The repository within the registry
-## @param image.pullPolicy The image pull policy
-## @param image.tag Overrides the image tag whose default is the chart appVersion
-##
-image:
-  registry: ghcr.io
-  repository: spiffe/spike-keeper
-  pullPolicy: IfNotPresent
-  tag: ""
-
-## @param replicas The number of keepers to launch
-replicas: 3
-
-trustRoot:
-  ## @param trustRoot.nexus Override which trustRoot Nexus is in
-  nexus: ""
-
-## @param logLevel The log level, valid values are "debug", "info", "warn", and "error"
-logLevel: debug
-
-## @param agentSocketName The name of the spire-agent unix socket
-agentSocketName: spire-agent.sock
-## @param csiDriverName The csi driver to use
-csiDriverName: csi.spiffe.io
-
-## @param imagePullSecrets [array] Pull secrets for images
-imagePullSecrets: []
-
-## @param nameOverride Name override
-nameOverride: ""
-
-## @param namespaceOverride Namespace override
-namespaceOverride: ""
-
-## @param fullnameOverride Fullname override
-fullnameOverride: ""
-
-## @param serviceAccount.create Specifies whether a service account should be created
-## @param serviceAccount.annotations [object] Annotations to add to the service account
-## @param serviceAccount.name The name of the service account to use. If not set and create is true, a name is generated.
-##
-serviceAccount:
-  create: true
-  annotations: {}
-  name: ""
-
-## @param labels [object] Labels for pods
-labels: {}
-
-## @param podSecurityContext [object] Pod security context
-podSecurityContext: {}
-  # fsGroup: 2000
-
-## @param securityContext [object] Security context
-securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-## @param service.type Service type
-## @param service.port Service port
-## @param service.annotations Annotations for service resource
-##
-service:
-  type: ClusterIP
-  port: 443
-  annotations: {}
-
-## @param nodeSelector (Optional) Select specific nodes to run on.
-nodeSelector: {}
-
-## @param affinity [object] Affinity rules
-affinity: {}
-
-## @param tolerations [array] List of tolerations
-tolerations: []
-
-## @param topologySpreadConstraints [array] List of topology spread constraints for resilience
-topologySpreadConstraints: []
-
-## Provide minimal resources to prevent accidental crashes due to resource exhaustion
-# resources:
-#   requests:
-#     cpu: 50m
-#     memory: 128Mi
-#   limits:
-#     cpu: 100m
-#     memory: 512Mi
-
-## Configure extra options for startup probe
-## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-startup-probes
-## @param startupProbe.enabled Enable startupProbe
-## @param startupProbe.initialDelaySeconds Initial delay seconds for startupProbe
-## @param startupProbe.periodSeconds Period seconds for startupProbe
-## @param startupProbe.timeoutSeconds Timeout seconds for startupProbe
-## @param startupProbe.failureThreshold Failure threshold count for startupProbe
-## @param startupProbe.successThreshold Success threshold count for startupProbe
-##
-startupProbe:
-  enabled: true
-  initialDelaySeconds: 5
-  periodSeconds: 10
-  timeoutSeconds: 5
-  failureThreshold: 6
-  successThreshold: 1
-
-## @param ingress.enabled Flag to enable ingress
-## @param ingress.className Ingress class name
-## @param ingress.controllerType Specify what type of ingress controller you're using to add the necessary annotations accordingly. If blank, auto-detection is attempted. If other, no annotations will be added. Must be one of [ingress-nginx, openshift, other, ""].
-## @param ingress.annotations [object] Annotations
-ingress:
-  enabled: false
-  className: ""
-  controllerType: ""
-  annotations: {}
-
-  ## @param ingress.host Host name for the ingress. If no '.' in host, trustDomain is automatically appended. The rest of the rules will be autogenerated. For more customizability, use hosts[] instead.
-  host: "keeper"
-
-  ## @param ingress.tlsSecret Secret that has the certs. If blank will use default certs. Used with host var.
-  tlsSecret: ""
-
-  ## @param ingress.hosts [array] Host paths for ingress object. If empty, rules will be built based on the host var.
-  hosts: []
-
-  ## @param ingress.tls [array] Secrets containing TLS certs to enable https on ingress. If empty, rules will be built based on the host and tlsSecret vars.
-  tls: []

charts/spire/charts/spike-nexus/Chart.yaml

@@ -1,13 +0,0 @@
-apiVersion: v2
-name: spike-nexus
-description: A Helm chart to deploy SPIKE Nexus
-type: application
-version: 0.1.0
-appVersion: "0.4.2"
-home: https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spire
-sources:
-  - https://github.com/spiffe/spike
-icon: https://spike.ist/assets/spike-banner.png
-maintainers:
-  - name: kfox1111
-    email: Kevin.Fox@pnnl.gov

charts/spire/charts/spike-nexus/README.md

@@ -1,83 +0,0 @@
-# spike-nexus
-
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.4.1](https://img.shields.io/badge/AppVersion-v0.4.1-informational?style=flat-square)
-[![Development Phase](https://github.com/spiffe/spiffe/blob/main/.img/maturity/dev.svg)](https://github.com/spiffe/spiffe/blob/main/MATURITY.md#development)
-
-A Helm chart to deploy spike nexus
-
-**Homepage:** <https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spire>
-
-## Version support
-
-> [!Note]
-> This Chart is still in development and still subject to change the API (`values.yaml`).
-> Until we reach a `1.0.0` version of the chart we can't guarantee backwards compatibility although
-> we do aim for as much stability as possible.
-
-| Dependency | Supported Versions |
-|:-----------|:-------------------|
-| Helm       | `3.x`              |
-
-## Source Code
-
-* <https://github.com/spiffe/spike>
-
-<!-- The parameters section is generated using helm-docs.sh and should not be edited by hand. -->
-
-## Parameters
-
-### Chart parameters
-
-| Name                               | Description                                                                                                                                                                                                                             | Value                |
-| ---------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------- |
-| `image.registry`                   | The OCI registry to pull the image from                                                                                                                                                                                                 | `ghcr.io`            |
-| `image.repository`                 | The repository within the registry                                                                                                                                                                                                      | `spiffe/spike-nexus` |
-| `image.pullPolicy`                 | The image pull policy                                                                                                                                                                                                                   | `IfNotPresent`       |
-| `image.tag`                        | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                           | `""`                 |
-| `backendStore`                     | The backend store to use. Must be one of [sqlite, memory, lite]                                                                                                                                                                         | `sqlite`             |
-| `replicas`                         | The number of keepers to launch                                                                                                                                                                                                         | `1`                  |
-| `shamir.shares`                    | How many shares to configure for shamir secrets                                                                                                                                                                                         | `3`                  |
-| `shamir.threshold`                 | How many shares needed to recover                                                                                                                                                                                                       | `2`                  |
-| `keeperPeers`                      | Keeper peer configuration. If blank, it will be autodetected                                                                                                                                                                            | `[]`                 |
-| `trustRoot.nexus`                  | Override which trustRoot Nexus is in                                                                                                                                                                                                    | `""`                 |
-| `trustRoot.keepers`                | Override which trustRoot Keepers are in                                                                                                                                                                                                 | `[]`                 |
-| `trustRoot.pilot`                  | Override which trustRoot Pilot is in                                                                                                                                                                                                    | `""`                 |
-| `logLevel`                         | The log level, valid values are "debug", "info", "warn", and "error"                                                                                                                                                                    | `debug`              |
-| `agentSocketName`                  | The name of the spire-agent unix socket                                                                                                                                                                                                 | `spire-agent.sock`   |
-| `csiDriverName`                    | The csi driver to use                                                                                                                                                                                                                   | `csi.spiffe.io`      |
-| `imagePullSecrets`                 | Pull secrets for images                                                                                                                                                                                                                 | `[]`                 |
-| `nameOverride`                     | Name override                                                                                                                                                                                                                           | `""`                 |
-| `namespaceOverride`                | Namespace override                                                                                                                                                                                                                      | `""`                 |
-| `fullnameOverride`                 | Fullname override                                                                                                                                                                                                                       | `""`                 |
-| `serviceAccount.create`            | Specifies whether a service account should be created                                                                                                                                                                                   | `true`               |
-| `serviceAccount.annotations`       | Annotations to add to the service account                                                                                                                                                                                               | `{}`                 |
-| `serviceAccount.name`              | The name of the service account to use. If not set and create is true, a name is generated.                                                                                                                                             | `""`                 |
-| `labels`                           | Labels for pods                                                                                                                                                                                                                         | `{}`                 |
-| `podSecurityContext`               | Pod security context                                                                                                                                                                                                                    | `{}`                 |
-| `securityContext`                  | Security context                                                                                                                                                                                                                        | `{}`                 |
-| `service.type`                     | Service type                                                                                                                                                                                                                            | `ClusterIP`          |
-| `service.port`                     | Service port                                                                                                                                                                                                                            | `443`                |
-| `service.annotations`              | Annotations for service resource                                                                                                                                                                                                        | `{}`                 |
-| `nodeSelector`                     | (Optional) Select specific nodes to run on.                                                                                                                                                                                             | `{}`                 |
-| `affinity`                         | Affinity rules                                                                                                                                                                                                                          | `{}`                 |
-| `tolerations`                      | List of tolerations                                                                                                                                                                                                                     | `[]`                 |
-| `topologySpreadConstraints`        | List of topology spread constraints for resilience                                                                                                                                                                                      | `[]`                 |
-| `startupProbe.enabled`             | Enable startupProbe                                                                                                                                                                                                                     | `true`               |
-| `startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe                                                                                                                                                                                                  | `5`                  |
-| `startupProbe.periodSeconds`       | Period seconds for startupProbe                                                                                                                                                                                                         | `10`                 |
-| `startupProbe.timeoutSeconds`      | Timeout seconds for startupProbe                                                                                                                                                                                                        | `5`                  |
-| `startupProbe.failureThreshold`    | Failure threshold count for startupProbe                                                                                                                                                                                                | `6`                  |
-| `startupProbe.successThreshold`    | Success threshold count for startupProbe                                                                                                                                                                                                | `1`                  |
-| `ingress.enabled`                  | Flag to enable ingress                                                                                                                                                                                                                  | `false`              |
-| `ingress.className`                | Ingress class name                                                                                                                                                                                                                      | `""`                 |
-| `ingress.controllerType`           | Specify what type of ingress controller you're using to add the necessary annotations accordingly. If blank, auto-detection is attempted. If other, no annotations will be added. Must be one of [ingress-nginx, openshift, other, ""]. | `""`                 |
-| `ingress.annotations`              | Annotations                                                                                                                                                                                                                             | `{}`                 |
-| `ingress.host`                     | Host name for the ingress. If no '.' in host, trustDomain is automatically appended. The rest of the rules will be autogenerated. For more customizability, use hosts[] instead.                                                        | `nexus`              |
-| `ingress.tlsSecret`                | Secret that has the certs. If blank will use default certs. Used with host var.                                                                                                                                                         | `""`                 |
-| `ingress.hosts`                    | Host paths for ingress object. If empty, rules will be built based on the host var.                                                                                                                                                     | `[]`                 |
-| `ingress.tls`                      | Secrets containing TLS certs to enable https on ingress. If empty, rules will be built based on the host and tlsSecret vars.                                                                                                            | `[]`                 |
-| `persistence.type`                 | What type of volume to use for persistence. Valid options pvc (recommended), hostPath, emptyDir (testing only)                                                                                                                          | `pvc`                |
-| `persistence.size`                 | What size volume to use for persistence                                                                                                                                                                                                 | `1Gi`                |
-| `persistence.accessMode`           | What access mode to use for persistence. Valid options are ReadWriteOnce (recommended), ReadWriteOncePod, ReadWriteMany (not recommended)                                                                                               | `ReadWriteOnce`      |
-| `persistence.storageClass`         | What storage class to use for persistence                                                                                                                                                                                               | `nil`                |
-| `persistence.hostPath`             | Which path to use on the host when persistence.type = hostPath                                                                                                                                                                          | `""`                 |

charts/spire/charts/spike-nexus/templates/NOTES.txt

@@ -1 +0,0 @@
-Installed {{ .Chart.Name }}…

charts/spire/charts/spike-nexus/templates/_helpers.tpl

@@ -1,83 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "spike-nexus.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "spike-nexus.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Allow the release namespace to be overridden for multi-namespace deployments in combined charts
-*/}}
-{{- define "spike-nexus.namespace" -}}
-  {{- if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else if and (dig "spire" "recommendations" "enabled" false .Values.global) (dig "spire" "recommendations" "namespaceLayout" true .Values.global) }}
-    {{- if ne (len (dig "spire" "namespaces" "server" "name" "" .Values.global)) 0 }}
-      {{- .Values.global.spire.namespaces.server.name }}
-    {{- else }}
-      {{- printf "spire-server" }}
-    {{- end }}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "spike-nexus.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "spike-nexus.labels" -}}
-helm.sh/chart: {{ include "spike-nexus.chart" . }}
-{{ include "spike-nexus.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "spike-nexus.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "spike-nexus.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "spike-nexus.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "spike-nexus.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
-{{- define "spike-nexus.workload-api-socket-path" -}}
-{{- printf "/spiffe-workload-api/%s" .Values.agentSocketName }}
-{{- end }}

charts/spire/charts/spike-nexus/templates/ingress.yaml

@@ -1,31 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{ $root := . }}
-{{- $ingressControllerType := include "spire-lib.ingress-controller-type" (dict "global" .Values.global "ingress" .Values.ingress) }}
-{{- $fullName := include "spike-nexus.fullname" . -}}
-{{- $tlsSection := true }}
-{{- $annotations := deepCopy .Values.ingress.annotations }}
-{{- if eq $ingressControllerType "ingress-nginx" }}
-{{-   $_ := set $annotations "nginx.ingress.kubernetes.io/ssl-redirect" "true" }}
-{{-   $_ := set $annotations "nginx.ingress.kubernetes.io/force-ssl-redirect" "true" }}
-{{-   $_ := set $annotations "nginx.ingress.kubernetes.io/backend-protocol" "HTTPS" }}
-{{-   $_ := set $annotations "nginx.ingress.kubernetes.io/ssl-passthrough" "true" }}
-{{- else if eq $ingressControllerType "openshift" }}
-{{-   $path = "" }}
-{{-   $_ := set $annotations "route.openshift.io/termination" "passthrough" }}
-{{-   $tlsSection = false }}
-{{- end }}
-{{ $last := sub (.Values.replicas | int) 1 | int }}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  namespace: {{ include "spike-nexus.namespace" $root }}
-  labels:
-    {{ include "spike-nexus.labels" $root | nindent 4}}
-  {{- with $annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{ include "spire-lib.ingress-spec" (dict "ingress" .Values.ingress "svcName" $fullName "port" $root.Values.service.port "path" "/" "pathType" "Prefix" "tlsSection" $tlsSection "Values" $root.Values) | nindent 2 }}
-{{- end }}

charts/spire/charts/spike-nexus/templates/service.yaml

@@ -1,20 +0,0 @@
-{{ $root := . }}
-apiVersion: v1
-kind: Service
-metadata:
-  namespace: {{ include "spike-nexus.namespace" $root }}
-  name: {{ include "spike-nexus.fullname" $root }}
-  {{- with $root.Values.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels:
-    {{- include "spike-nexus.labels" $root | nindent 4 }}
-spec:
-  type: {{ $root.Values.service.type }}
-  selector:
-    {{- include "spike-nexus.selectorLabels" $root | nindent 4 }}
-  ports:
-    - name: {{ include "spike-nexus.fullname" $root }}
-      port: {{ $root.Values.service.port }}
-      targetPort: http

charts/spire/charts/spike-nexus/templates/serviceaccount.yaml

@@ -1,13 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "spike-nexus.serviceAccountName" . }}
-  namespace: {{ include "spike-nexus.namespace" . }}
-  labels:
-    {{- include "spike-nexus.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}

charts/spire/charts/spike-nexus/templates/statefulset.yaml

@@ -1,114 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: {{ include "spike-nexus.fullname" . }}
-  namespace: {{ include "spike-nexus.namespace" . }}
-  labels:
-    {{- include "spike-nexus.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.replicas }}
-  selector:
-    matchLabels:
-      {{- include "spike-nexus.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      labels:
-        {{- include "spike-nexus.selectorLabels" . | nindent 8 }}
-        release: {{ .Release.Name }}
-        release-namespace: {{ .Release.Namespace }}
-        component: spike-nexus
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "spike-nexus.serviceAccountName" . }}
-      securityContext:
-        {{- include "spire-lib.podsecuritycontext" . | nindent 8 }}
-      containers:
-        - name:  {{ include "spike-nexus.fullname" . }}
-          image: {{ template "spire-lib.image" (dict "appVersion" $.Chart.AppVersion "image" .Values.image "global" .Values.global "ubi" true) }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          securityContext:
-            {{- include "spire-lib.securitycontext" . | nindent 12 }}
-          ports:
-            - name: http
-              containerPort: 8443
-              protocol: TCP
-          env:
-            - name: SPIKE_NEXUS_BACKEND_STORE
-              value: {{ .Values.backendStore | quote }}
-            - name: SPIKE_NEXUS_SHAMIR_SHARES
-              value: {{ .Values.shamir.shares | quote }}
-            - name: SPIKE_NEXUS_SHAMIR_THRESHOLD
-              value: {{ .Values.shamir.threshold | quote }}
-            # Note: IP will depend on the testbed.
-            - name: SPIKE_NEXUS_KEEPER_PEERS
-              {{- if gt (len .Values.keeperPeers) 0 }}
-              value: {{ .Values.keeperPeers | join "," | quote }}
-              {{- else }}
-              value: https://{{ .Release.Name }}-spike-keeper-0.{{ .Release.Name }}-spike-keeper-headless:8443,https://{{ .Release.Name }}-spike-keeper-1.{{ .Release.Name }}-spike-keeper-headless:8443,https://{{ .Release.Name }}-spike-keeper-2.{{ .Release.Name }}-spike-keeper-headless:8443
-              {{- end }}
-            - name: SPIFFE_ENDPOINT_SOCKET
-              value: unix://{{ include "spike-nexus.workload-api-socket-path" . }}
-            - name: SPIKE_SYSTEM_LOG_LEVEL
-              value: {{ .Values.logLevel | upper }}
-            - name: SPIKE_TRUST_ROOT
-              value: {{ include "spire-lib.trust-domain" . }}
-            - name: SPIKE_TRUST_ROOT_KEEPER
-              value: {{ if gt (len .Values.trustRoot.keepers) 0 }}{{ .Values.trustRoot.keepers | join "," | quote}}{{ else }}{{ include "spire-lib.trust-domain" . }}{{ end }}
-            - name: SPIKE_TRUST_ROOT_PILOT
-              value: {{if eq .Values.trustRoot.pilot "" }}{{ include "spire-lib.trust-domain" . }}{{ else }}{{.Values.trustRoot.pilot }}{{ end }}
-            - name: SPIKE_NEXUS_TLS_PORT
-              value: ":8443"
-          {{- if .Values.startupProbe.enabled }}
-          startupProbe:
-            tcpSocket:
-              port: 8443
-            failureThreshold: {{ .Values.startupProbe.failureThreshold }}
-            initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.startupProbe.periodSeconds }}
-            successThreshold: {{ .Values.startupProbe.successThreshold }}
-            timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds }}
-          {{- end }}
-          volumeMounts:
-            - name: spiffe-workload-api
-              mountPath: {{ include "spike-nexus.workload-api-socket-path" . | dir }}
-              readOnly: true
-            - name: nexus-data
-              mountPath: /.spike
-      {{- with .Values.nodeSelector }}
-
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.topologySpreadConstraints }}
-      topologySpreadConstraints:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      volumes:
-        - name: spiffe-workload-api
-          csi:
-            driver: "{{ .Values.csiDriverName }}"
-            readOnly: true
-  volumeClaimTemplates:
-    - metadata:
-        name: nexus-data
-      spec:
-        accessModes:
-          - {{ .Values.persistence.accessMode | default "ReadWriteOnce" }}
-        resources:
-          requests:
-            storage: {{ .Values.persistence.size }}
-        {{- $storageClass := (dig "spire" "persistence" "storageClass" nil .Values.global) | default .Values.persistence.storageClass }}
-        {{- if $storageClass }}
-        storageClassName: {{ $storageClass }}
-        {{- end }}

charts/spire/charts/spike-nexus/values.yaml

@@ -1,175 +0,0 @@
-# Default configuration for SPIKE Keeper
-# SPDX-License-Identifier: APACHE-2.0
-
-## @skip global
-global: {}
-
-## @section Chart parameters
-##
-## @param image.registry The OCI registry to pull the image from
-## @param image.repository The repository within the registry
-## @param image.pullPolicy The image pull policy
-## @param image.tag Overrides the image tag whose default is the chart appVersion
-##
-image:
-  registry: ghcr.io
-  repository: spiffe/spike-nexus
-  pullPolicy: IfNotPresent
-  tag: ""
-
-## @param backendStore The backend store to use. Must be one of [sqlite, memory, lite]
-backendStore: sqlite
-
-## @param replicas The number of keepers to launch
-replicas: 1
-
-shamir:
-  ## @param shamir.shares How many shares to configure for shamir secrets
-  shares: 3
-  ## @param shamir.threshold How many shares needed to recover
-  threshold: 2
-
-## @param keeperPeers Keeper peer configuration. If blank, it will be autodetected
-keeperPeers: []
-
-trustRoot:
-  ## @param trustRoot.nexus Override which trustRoot Nexus is in
-  nexus: ""
-  ## @param trustRoot.keepers Override which trustRoot Keepers are in
-  keepers: []
-  ## @param trustRoot.pilot Override which trustRoot Pilot is in
-  pilot: ""
-
-## @param logLevel The log level, valid values are "debug", "info", "warn", and "error"
-logLevel: debug
-
-## @param agentSocketName The name of the spire-agent unix socket
-agentSocketName: spire-agent.sock
-## @param csiDriverName The csi driver to use
-csiDriverName: csi.spiffe.io
-
-## @param imagePullSecrets [array] Pull secrets for images
-imagePullSecrets: []
-
-## @param nameOverride Name override
-nameOverride: ""
-
-## @param namespaceOverride Namespace override
-namespaceOverride: ""
-
-## @param fullnameOverride Fullname override
-fullnameOverride: ""
-
-## @param serviceAccount.create Specifies whether a service account should be created
-## @param serviceAccount.annotations [object] Annotations to add to the service account
-## @param serviceAccount.name The name of the service account to use. If not set and create is true, a name is generated.
-##
-serviceAccount:
-  create: true
-  annotations: {}
-  name: ""
-
-## @param labels [object] Labels for pods
-labels: {}
-
-## @param podSecurityContext [object] Pod security context
-podSecurityContext: {}
-  # fsGroup: 2000
-
-## @param securityContext [object] Security context
-securityContext:
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  runAsNonRoot: true
-  runAsUser: 1000
-
-## @param service.type Service type
-## @param service.port Service port
-## @param service.annotations Annotations for service resource
-##
-service:
-  type: ClusterIP
-  port: 443
-  annotations: {}
-
-## @param nodeSelector (Optional) Select specific nodes to run on.
-nodeSelector: {}
-
-## @param affinity [object] Affinity rules
-affinity: {}
-
-## @param tolerations [array] List of tolerations
-tolerations: []
-
-## @param topologySpreadConstraints [array] List of topology spread constraints for resilience
-topologySpreadConstraints: []
-
-## Provide minimal resources to prevent accidental crashes due to resource exhaustion
-# resources:
-#   requests:
-#     cpu: 50m
-#     memory: 128Mi
-#   limits:
-#     cpu: 100m
-#     memory: 512Mi
-
-## Configure extra options for startup probe
-## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-startup-probes
-## @param startupProbe.enabled Enable startupProbe
-## @param startupProbe.initialDelaySeconds Initial delay seconds for startupProbe
-## @param startupProbe.periodSeconds Period seconds for startupProbe
-## @param startupProbe.timeoutSeconds Timeout seconds for startupProbe
-## @param startupProbe.failureThreshold Failure threshold count for startupProbe
-## @param startupProbe.successThreshold Success threshold count for startupProbe
-##
-startupProbe:
-  enabled: true
-  initialDelaySeconds: 5
-  periodSeconds: 10
-  timeoutSeconds: 5
-  failureThreshold: 6
-  successThreshold: 1
-
-## @param ingress.enabled Flag to enable ingress
-## @param ingress.className Ingress class name
-## @param ingress.controllerType Specify what type of ingress controller you're using to add the necessary annotations accordingly. If blank, auto-detection is attempted. If other, no annotations will be added. Must be one of [ingress-nginx, openshift, other, ""].
-## @param ingress.annotations [object] Annotations
-ingress:
-  enabled: false
-  className: ""
-  controllerType: ""
-  annotations: {}
-
-  ## @param ingress.host Host name for the ingress. If no '.' in host, trustDomain is automatically appended. The rest of the rules will be autogenerated. For more customizability, use hosts[] instead.
-  host: "nexus"
-
-  ## @param ingress.tlsSecret Secret that has the certs. If blank will use default certs. Used with host var.
-  tlsSecret: ""
-
-  ## @param ingress.hosts [array] Host paths for ingress object. If empty, rules will be built based on the host var.
-  hosts: []
-  #   - host: nexus.example.org
-  #     paths:
-  #       - path: /
-  #         pathType: Prefix
-
-  ## @param ingress.tls [array] Secrets containing TLS certs to enable https on ingress. If empty, rules will be built based on the host and tlsSecret vars.
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - nexus.example.org
-
-## @param persistence.type What type of volume to use for persistence. Valid options pvc (recommended), hostPath, emptyDir (testing only)
-## @param persistence.size What size volume to use for persistence
-## @param persistence.accessMode What access mode to use for persistence. Valid options are ReadWriteOnce (recommended), ReadWriteOncePod, ReadWriteMany (not recommended)
-## @param persistence.storageClass What storage class to use for persistence
-## @param persistence.hostPath Which path to use on the host when persistence.type = hostPath
-##
-persistence:
-  type: pvc
-  size: 1Gi
-  accessMode: ReadWriteOnce
-  storageClass: null
-  hostPath: ""

charts/spire/charts/spike-pilot/Chart.yaml

@@ -1,13 +0,0 @@
-apiVersion: v2
-name: spike-pilot
-description: A Helm chart to deploy SPIKE Pilot
-type: application
-version: 0.1.0
-appVersion: "0.4.2"
-home: https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spire
-sources:
-  - https://github.com/spiffe/spike
-icon: https://spike.ist/assets/spike-banner.png
-maintainers:
-  - name: kfox1111
-    email: Kevin.Fox@pnnl.gov

charts/spire/charts/spike-pilot/README.md

@@ -1,63 +0,0 @@
-# spike-pilot
-
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.4.1](https://img.shields.io/badge/AppVersion-v0.4.1-informational?style=flat-square)
-[![Development Phase](https://github.com/spiffe/spiffe/blob/main/.img/maturity/dev.svg)](https://github.com/spiffe/spiffe/blob/main/MATURITY.md#development)
-
-A Helm chart to deploy spike pilot
-
-**Homepage:** <https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spire>
-
-## Version support
-
-> [!Note]
-> This Chart is still in development and still subject to change the API (`values.yaml`).
-> Until we reach a `1.0.0` version of the chart we can't guarantee backwards compatibility although
-> we do aim for as much stability as possible.
-
-| Dependency | Supported Versions |
-|:-----------|:-------------------|
-| Helm       | `3.x`              |
-
-## Source Code
-
-* <https://github.com/spiffe/spike>
-
-<!-- The parameters section is generated using helm-docs.sh and should not be edited by hand. -->
-
-## Parameters
-
-### Chart parameters
-
-| Name                             | Description                                                                                 | Value                |
-| -------------------------------- | ------------------------------------------------------------------------------------------- | -------------------- |
-| `image.registry`                 | The OCI registry to pull the image from                                                     | `ghcr.io`            |
-| `image.repository`               | The repository within the registry                                                          | `spiffe/spike-pilot` |
-| `image.pullPolicy`               | The image pull policy                                                                       | `IfNotPresent`       |
-| `image.tag`                      | Overrides the image tag whose default is the chart appVersion                               | `""`                 |
-| `shell.image.registry`           | The OCI registry to pull the image from                                                     | `""`                 |
-| `shell.image.repository`         | The repository within the registry                                                          | `busybox`            |
-| `shell.image.pullPolicy`         | The image pull policy                                                                       | `IfNotPresent`       |
-| `shell.image.tag`                | Overrides the image tag whose default is the chart appVersion                               | `1.37.0-uclibc`      |
-| `tools.busybox.image.registry`   | The OCI registry to pull the image from                                                     | `""`                 |
-| `tools.busybox.image.repository` | The repository within the registry                                                          | `busybox`            |
-| `tools.busybox.image.pullPolicy` | The image pull policy                                                                       | `IfNotPresent`       |
-| `tools.busybox.image.tag`        | Overrides the image tag whose default is the chart appVersion                               | `1.37.0-uclibc`      |
-| `replicas`                       | The number of keepers to launch                                                             | `1`                  |
-| `trustRoot.nexus`                | Override which trustRoot Nexus is in                                                        | `""`                 |
-| `logLevel`                       | The log level, valid values are "debug", "info", "warn", and "error"                        | `debug`              |
-| `agentSocketName`                | The name of the spire-agent unix socket                                                     | `spire-agent.sock`   |
-| `csiDriverName`                  | The csi driver to use                                                                       | `csi.spiffe.io`      |
-| `imagePullSecrets`               | Pull secrets for images                                                                     | `[]`                 |
-| `nameOverride`                   | Name override                                                                               | `""`                 |
-| `namespaceOverride`              | Namespace override                                                                          | `""`                 |
-| `fullnameOverride`               | Fullname override                                                                           | `""`                 |
-| `serviceAccount.create`          | Specifies whether a service account should be created                                       | `true`               |
-| `serviceAccount.annotations`     | Annotations to add to the service account                                                   | `{}`                 |
-| `serviceAccount.name`            | The name of the service account to use. If not set and create is true, a name is generated. | `""`                 |
-| `labels`                         | Labels for pods                                                                             | `{}`                 |
-| `podSecurityContext`             | Pod security context                                                                        | `{}`                 |
-| `securityContext`                | Security context                                                                            | `{}`                 |
-| `nodeSelector`                   | (Optional) Select specific nodes to run on.                                                 | `{}`                 |
-| `affinity`                       | Affinity rules                                                                              | `{}`                 |
-| `tolerations`                    | List of tolerations                                                                         | `[]`                 |
-| `topologySpreadConstraints`      | List of topology spread constraints for resilience                                          | `[]`                 |

charts/spire/charts/spike-pilot/templates/NOTES.txt

@@ -1 +0,0 @@
-Installed {{ .Chart.Name }}…

charts/spire/charts/spike-pilot/templates/_helpers.tpl

@@ -1,83 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "spike-pilot.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "spike-pilot.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Allow the release namespace to be overridden for multi-namespace deployments in combined charts
-*/}}
-{{- define "spike-pilot.namespace" -}}
-  {{- if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else if and (dig "spire" "recommendations" "enabled" false .Values.global) (dig "spire" "recommendations" "namespaceLayout" true .Values.global) }}
-    {{- if ne (len (dig "spire" "namespaces" "server" "name" "" .Values.global)) 0 }}
-      {{- .Values.global.spire.namespaces.server.name }}
-    {{- else }}
-      {{- printf "spire-server" }}
-    {{- end }}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "spike-pilot.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "spike-pilot.labels" -}}
-helm.sh/chart: {{ include "spike-pilot.chart" . }}
-{{ include "spike-pilot.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "spike-pilot.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "spike-pilot.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "spike-pilot.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "spike-pilot.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
-{{- define "spike-pilot.workload-api-socket-path" -}}
-{{- printf "/spiffe-workload-api/%s" .Values.agentSocketName }}
-{{- end }}

charts/spire/charts/spike-pilot/templates/deployment.yaml

@@ -1,96 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "spike-pilot.fullname" . }}
-  namespace: {{ include "spike-pilot.namespace" . }}
-  labels:
-    {{- include "spike-pilot.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.replicas }}
-  selector:
-    matchLabels:
-      {{- include "spike-pilot.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      labels:
-        {{- include "spike-pilot.selectorLabels" . | nindent 8 }}
-        release: {{ .Release.Name }}
-        release-namespace: {{ .Release.Namespace }}
-        component: spike-pilot
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "spike-pilot.serviceAccountName" . }}
-      securityContext:
-        {{- include "spire-lib.podsecuritycontext" . | nindent 8 }}
-      initContainers:
-        - name:  init
-          image: {{ template "spire-lib.image" (dict "appVersion" $.Chart.AppVersion "image" .Values.tools.busybox.image "global" .Values.global "ubi" true) }}
-          imagePullPolicy: {{ .Values.tools.busybox.image.pullPolicy }}
-          command: ["/bin/sh", "-c", "cp -a /bin/busybox /data"]
-          securityContext:
-            {{- include "spire-lib.securitycontext" . | nindent 12 }}
-          volumeMounts:
-            - name: pilot
-              mountPath: /data
-        - name:  init2
-          image: {{ template "spire-lib.image" (dict "appVersion" $.Chart.AppVersion "image" .Values.image "global" .Values.global "ubi" true) }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command: ["/data/busybox", "sh", "-c", "/data/busybox cp -a /usr/local/bin/spike /data && /data/busybox rm -f /data/busybox"]
-          securityContext:
-            {{- include "spire-lib.securitycontext" . | nindent 12 }}
-          volumeMounts:
-            - name: pilot
-              mountPath: /data
-      containers:
-        - name:  {{ include "spike-pilot.fullname" . }}
-          image: {{ template "spire-lib.image" (dict "appVersion" $.Chart.AppVersion "image" .Values.shell.image "global" .Values.global "ubi" true) }}
-          imagePullPolicy: {{ .Values.shell.image.pullPolicy }}
-          command: ["/bin/sh", "-c", "echo I live; while true; do sleep 1000; done"]
-          securityContext:
-            {{- include "spire-lib.securitycontext" . | nindent 12 }}
-          env:
-            #FIXME make this configurable
-            - name: SPIKE_NEXUS_API_URL
-              value: https://{{ .Release.Name }}-spike-nexus:443
-            - name: SPIFFE_ENDPOINT_SOCKET
-              value: unix://{{ include "spike-pilot.workload-api-socket-path" . }}
-            - name: SPIKE_SYSTEM_LOG_LEVEL
-              value: {{ .Values.logLevel | upper }}
-            - name: SPIKE_TRUST_ROOT
-              value: {{ include "spire-lib.trust-domain" . }}
-            - name: SPIKE_TRUST_ROOT_NEXUS
-              value: {{if eq .Values.trustRoot.Nexus "" }}{{ include "spire-lib.trust-domain" . }}{{ else }}{{.Values.trustRoot.Nexus }}{{ end }}
-          volumeMounts:
-            - name: spiffe-workload-api
-              mountPath: {{ include "spike-pilot.workload-api-socket-path" . | dir }}
-              readOnly: true
-            - name: pilot
-              mountPath: /bin/spike
-              subPath: spike
-              readOnly: true
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.topologySpreadConstraints }}
-      topologySpreadConstraints:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      volumes:
-        - name: pilot
-          emptyDir: {}
-        - name: spiffe-workload-api
-          csi:
-            driver: "{{ .Values.csiDriverName }}"
-            readOnly: true

charts/spire/charts/spike-pilot/templates/serviceaccount.yaml

@@ -1,13 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "spike-pilot.serviceAccountName" . }}
-  namespace: {{ include "spike-pilot.namespace" . }}
-  labels:
-    {{- include "spike-pilot.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}

charts/spire/charts/spike-pilot/values.yaml

@@ -1,116 +0,0 @@
-# Default configuration for SPIKE Keeper
-# SPDX-License-Identifier: APACHE-2.0
-
-## @skip global
-global: {}
-
-## @section Chart parameters
-##
-## @param image.registry The OCI registry to pull the image from
-## @param image.repository The repository within the registry
-## @param image.pullPolicy The image pull policy
-## @param image.tag Overrides the image tag whose default is the chart appVersion
-##
-image:
-  registry: ghcr.io
-  repository: spiffe/spike-pilot
-  pullPolicy: IfNotPresent
-  tag: ""
-
-shell:
-  ## @param shell.image.registry The OCI registry to pull the image from
-  ## @param shell.image.repository The repository within the registry
-  ## @param shell.image.pullPolicy The image pull policy
-  ## @param shell.image.tag Overrides the image tag whose default is the chart appVersion
-  ##
-  image:
-    registry: ""
-    repository: busybox
-    pullPolicy: IfNotPresent
-    tag: 1.37.0-uclibc
-
-tools:
-  busybox:
-    ## @param tools.busybox.image.registry The OCI registry to pull the image from
-    ## @param tools.busybox.image.repository The repository within the registry
-    ## @param tools.busybox.image.pullPolicy The image pull policy
-    ## @param tools.busybox.image.tag Overrides the image tag whose default is the chart appVersion
-    ##
-    image:
-      registry: ""
-      repository: busybox
-      pullPolicy: IfNotPresent
-      tag: 1.37.0-uclibc
-
-## @param replicas The number of keepers to launch
-replicas: 1
-
-trustRoot:
-  ## @param trustRoot.nexus Override which trustRoot Nexus is in
-  nexus: ""
-
-## @param logLevel The log level, valid values are "debug", "info", "warn", and "error"
-logLevel: debug
-
-## @param agentSocketName The name of the spire-agent unix socket
-agentSocketName: spire-agent.sock
-## @param csiDriverName The csi driver to use
-csiDriverName: csi.spiffe.io
-
-## @param imagePullSecrets [array] Pull secrets for images
-imagePullSecrets: []
-
-## @param nameOverride Name override
-nameOverride: ""
-
-## @param namespaceOverride Namespace override
-namespaceOverride: ""
-
-## @param fullnameOverride Fullname override
-fullnameOverride: ""
-
-## @param serviceAccount.create Specifies whether a service account should be created
-## @param serviceAccount.annotations [object] Annotations to add to the service account
-## @param serviceAccount.name The name of the service account to use. If not set and create is true, a name is generated.
-##
-serviceAccount:
-  create: true
-  annotations: {}
-  name: ""
-
-## @param labels [object] Labels for pods
-labels: {}
-
-## @param podSecurityContext [object] Pod security context
-podSecurityContext: {}
-  # fsGroup: 2000
-
-## @param securityContext [object] Security context
-securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-## @param nodeSelector (Optional) Select specific nodes to run on.
-nodeSelector: {}
-
-## @param affinity [object] Affinity rules
-affinity: {}
-
-## @param tolerations [array] List of tolerations
-tolerations: []
-
-## @param topologySpreadConstraints [array] List of topology spread constraints for resilience
-topologySpreadConstraints: []
-
-## Provide minimal resources to prevent accidental crashes due to resource exhaustion
-# resources:
-#   requests:
-#     cpu: 50m
-#     memory: 128Mi
-#   limits:
-#     cpu: 100m
-#     memory: 512Mi

charts/spire/charts/spire-agent/Chart.yaml

@@ -3,7 +3,7 @@ name: spire-agent
 description: A Helm chart to install the SPIRE agent.
 type: application
 version: 0.1.0
-appVersion: "1.12.4"
+appVersion: "1.11.0"
 keywords: ["spiffe", "spire-agent"]
 home: https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spire
 sources:

charts/spire/charts/spire-agent/README.md

@@ -52,7 +52,7 @@ A Helm chart to install the SPIRE agent.
 | `clusterName`                                          | The name of the Kubernetes cluster (`kubeadm init --service-dns-domain`)                                                                                                                          | `example-cluster`                                                                |
 | `trustDomain`                                          | The trust domain to be used for the SPIFFE identifiers                                                                                                                                            | `example.org`                                                                    |
 | `trustBundleURL`                                       | If set, obtain trust bundle from url instead of Kubernetes ConfigMap                                                                                                                              | `""`                                                                             |
-| `trustBundleFormat`                                    | If using trustBundleURL, what format is the url. Choices are "pem" and "spiffe"                                                                                                                   | `spiffe`                                                                         |
+| `trustBundleFormat`                                    | If using trustBundleURL, what format is the url. Choices are "pem" and "spiffe"                                                                                                                   | `pem`                                                                            |
 | `trustBundleHostPath`                                  | If set, obtain trust bundle from a file on the host instead of from the ConfigMap                                                                                                                 | `""`                                                                             |
 | `bundleConfigMap`                                      | Configmap name for Spire bundle                                                                                                                                                                   | `spire-bundle`                                                                   |
 | `availabilityTarget`                                   | The minimum amount of time desired to gracefully handle SPIRE Server or Agent downtime. This configurable influences how aggressively X509 SVIDs should be rotated. If set, must be at least 24h. | `""`                                                                             |
@@ -70,28 +70,26 @@ A Helm chart to install the SPIRE agent.
 | `fsGroupFix.image.registry`                            | The OCI registry to pull the image from                                                                                                                                                           | `cgr.dev`                                                                        |
 | `fsGroupFix.image.repository`                          | The repository within the registry                                                                                                                                                                | `chainguard/bash`                                                                |
 | `fsGroupFix.image.pullPolicy`                          | The image pull policy                                                                                                                                                                             | `Always`                                                                         |
-| `fsGroupFix.image.tag`                                 | Overrides the image tag whose default is the chart appVersion                                                                                                                                     | `latest@sha256:330ad2ea11cf3018a331326fb08e44cedd0c0c604cfbfcff32b81272460bb679` |
+| `fsGroupFix.image.tag`                                 | Overrides the image tag whose default is the chart appVersion                                                                                                                                     | `latest@sha256:a5cd47a3caf0668c48c6ad4bb66436cab40aa335634f3b5740ffd2a0c39770b2` |
 | `fsGroupFix.resources`                                 | Specify resource needs as per https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/                                                                                      | `{}`                                                                             |
 | `keyManager.memory.enabled`                            | Enable the memory based Key Manager                                                                                                                                                               | `true`                                                                           |
-| `keyManager.disk.enabled`                              | Enable the disk based Key Manager (must have persistence.type set to hostPath when enabled)                                                                                                       | `false`                                                                          |
 | `nodeAttestor.k8sPSAT.enabled`                         | Enable PSAT k8s Node Attestor                                                                                                                                                                     | `true`                                                                           |
 | `nodeAttestor.httpChallenge.enabled`                   | Enable the http challenge Node Attestor                                                                                                                                                           | `false`                                                                          |
 | `nodeAttestor.httpChallenge.agentname`                 | Name of this agent. Useful if you have multiple agents bound to different spire servers on the same host and sharing the same port.                                                               | `default`                                                                        |
 | `nodeAttestor.httpChallenge.port`                      | The port to listen on. If 0, a random value will be used.                                                                                                                                         | `0`                                                                              |
 | `nodeAttestor.httpChallenge.advertisedPort`            | The port to tell the server to call back on. Set only if your using an http proxy on the hosts. If 0, will use the port setting.                                                                  | `0`                                                                              |
 | `nodeAttestor.tpmDirect.enabled`                       | Enable the direct TPM node attestor, a 3rd party plugin by Boxboat. This plugin is experimental.                                                                                                  | `false`                                                                          |
-| `nodeAttestor.tpmDirect.plugin.image.registry`         | The OCI registry to pull the image from                                                                                                                                                           | `ghcr.io`                                                                        |
-| `nodeAttestor.tpmDirect.plugin.image.repository`       | The repository within the registry                                                                                                                                                                | `spiffe/spire-tpm-plugin-tpm-attestor-agent`                                     |
+| `nodeAttestor.tpmDirect.plugin.image.registry`         | The OCI registry to pull the image from                                                                                                                                                           | `docker.io`                                                                      |
+| `nodeAttestor.tpmDirect.plugin.image.repository`       | The repository within the registry                                                                                                                                                                | `boxboat/spire-tpm-plugin-tpm-attestor-agent`                                    |
 | `nodeAttestor.tpmDirect.plugin.image.pullPolicy`       | The image pull policy                                                                                                                                                                             | `IfNotPresent`                                                                   |
-| `nodeAttestor.tpmDirect.plugin.image.tag`              | Overrides the image tag                                                                                                                                                                           | `v1.9.0`                                                                         |
-| `nodeAttestor.tpmDirect.plugin.checksum`               | The sha256 checksum of the plugin binary                                                                                                                                                          | `22f67063f1699330e70cdedc9b923e517688f5ae71085a26bd9b83b3060ee86e`               |
+| `nodeAttestor.tpmDirect.plugin.image.tag`              | Overrides the image tag                                                                                                                                                                           | `v1.8.7`                                                                         |
+| `nodeAttestor.tpmDirect.plugin.checksum`               | The sha256 checksum of the plugin binary                                                                                                                                                          | `1d7c73ccac948ee86cbd78ddde2d30128a1838b403f7bb2100d38d916a252244`               |
 | `nodeAttestor.tpmDirect.plugin.path`                   | The filename in the container of the plugin                                                                                                                                                       | `/app/tpm_attestor_agent`                                                        |
 | `nodeAttestor.tpmDirect.pubHash.enabled`               | Display pubhash in logs                                                                                                                                                                           | `true`                                                                           |
-| `nodeAttestor.tpmDirect.pubHash.image.registry`        | The OCI registry to pull the image from                                                                                                                                                           | `ghcr.io`                                                                        |
-| `nodeAttestor.tpmDirect.pubHash.image.repository`      | The repository within the registry                                                                                                                                                                | `spiffe/spire-tpm-plugin-get-tpm-pubhash`                                        |
+| `nodeAttestor.tpmDirect.pubHash.image.registry`        | The OCI registry to pull the image from                                                                                                                                                           | `docker.io`                                                                      |
+| `nodeAttestor.tpmDirect.pubHash.image.repository`      | The repository within the registry                                                                                                                                                                | `boxboat/spire-tpm-plugin-get-tpm-pubhash`                                       |
 | `nodeAttestor.tpmDirect.pubHash.image.pullPolicy`      | The image pull policy                                                                                                                                                                             | `IfNotPresent`                                                                   |
-| `nodeAttestor.tpmDirect.pubHash.image.tag`             | Overrides the image tag                                                                                                                                                                           | `v1.9.0`                                                                         |
-| `nodeAttestor.awsIID.enabled`                          | Enable the aws_iid Node Attestor                                                                                                                                                                  | `false`                                                                          |
+| `nodeAttestor.tpmDirect.pubHash.image.tag`             | Overrides the image tag                                                                                                                                                                           | `v1.8.7`                                                                         |
 | `workloadAttestors.unix.enabled`                       | Enables the Unix workload attestor                                                                                                                                                                | `false`                                                                          |
 | `workloadAttestors.k8s.enabled`                        | Enables the Kubernetes workload attestor                                                                                                                                                          | `true`                                                                           |
 | `workloadAttestors.k8s.verification.type`              | What kind of verification to do against kubelet. auto will first attempt to use hostCert, and then fall back to apiServerCA. Valid options are [auto, hostCert, apiServerCA, skip]                | `skip`                                                                           |
@@ -110,21 +108,18 @@ A Helm chart to install the SPIRE agent.
 | `telemetry.prometheus.podMonitor.enabled`              | Enable podMonitor for prometheus                                                                                                                                                                  | `false`                                                                          |
 | `telemetry.prometheus.podMonitor.namespace`            | Override where to install the podMonitor, if not set will use the same namespace as the spire-agent                                                                                               | `""`                                                                             |
 | `telemetry.prometheus.podMonitor.labels`               | Pod labels to filter for prometheus monitoring                                                                                                                                                    | `{}`                                                                             |
-| `telemetry.datadog.enabled`                            | Flag to enable datadog monitoring                                                                                                                                                                 | `false`                                                                          |
-| `telemetry.datadog.address`                            | The address of the datadog service to send metrics to. The default URL for services are `<service-name>.<namespace>.svc`                                                                          | `datadog.kube-system.svc`                                                        |
-| `telemetry.datadog.port`                               | The port of the datadog service to send metrics to                                                                                                                                                | `8125`                                                                           |
 | `kubeletConnectByHostname`                             | If true, connect to kubelet using the nodes hostname. If false, uses localhost. If unset, defaults to true on OpenShift and false otherwise.                                                      | `""`                                                                             |
 | `socketPath`                                           | The unix socket path to the spire-agent                                                                                                                                                           | `/run/spire/agent-sockets/spire-agent.sock`                                      |
 | `socketAlternate.names`                                | List of alternate names for the socket that workloads might expect to be able to access in the driver mount.                                                                                      | `["socket","spire-agent.sock","api.sock"]`                                       |
 | `socketAlternate.image.registry`                       | The OCI registry to pull the image from                                                                                                                                                           | `cgr.dev`                                                                        |
 | `socketAlternate.image.repository`                     | The repository within the registry                                                                                                                                                                | `chainguard/bash`                                                                |
 | `socketAlternate.image.pullPolicy`                     | The image pull policy                                                                                                                                                                             | `Always`                                                                         |
-| `socketAlternate.image.tag`                            | Overrides the image tag whose default is the chart appVersion                                                                                                                                     | `latest@sha256:330ad2ea11cf3018a331326fb08e44cedd0c0c604cfbfcff32b81272460bb679` |
+| `socketAlternate.image.tag`                            | Overrides the image tag whose default is the chart appVersion                                                                                                                                     | `latest@sha256:a5cd47a3caf0668c48c6ad4bb66436cab40aa335634f3b5740ffd2a0c39770b2` |
 | `socketAlternate.resources`                            | Specify resource needs as per https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/                                                                                      | `{}`                                                                             |
 | `hostCert.image.registry`                              | The OCI registry to pull the image from                                                                                                                                                           | `cgr.dev`                                                                        |
 | `hostCert.image.repository`                            | The repository within the registry                                                                                                                                                                | `chainguard/min-toolkit-debug`                                                   |
 | `hostCert.image.pullPolicy`                            | The image pull policy                                                                                                                                                                             | `IfNotPresent`                                                                   |
-| `hostCert.image.tag`                                   | Overrides the image tag whose default is the chart appVersion                                                                                                                                     | `latest@sha256:f662d2b8c7c47e6d29c31b1bc8dbd039770d6186295bbc88bd8f540ca8ec3b53` |
+| `hostCert.image.tag`                                   | Overrides the image tag whose default is the chart appVersion                                                                                                                                     | `latest@sha256:424ac4637dac08a4594643b548d9af10144dcd6360b4b319a4c143841bf0bfee` |
 | `hostCert.resources`                                   | Specify resource needs as per https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/                                                                                      | `{}`                                                                             |
 | `priorityClassName`                                    | Priority class assigned to daemonset pods. Can be auto set with global.recommendations.priorityClassName.                                                                                         | `""`                                                                             |
 | `extraEnvVars`                                         | Extra environment variables to be added to the Spire Agent container                                                                                                                              | `[]`                                                                             |
@@ -141,8 +136,8 @@ A Helm chart to install the SPIRE agent.
 | `experimental.syncInterval`                            | Sync interval with SPIRE server with exponential backoff                                                                                                                                          | `5s`                                                                             |
 | `experimental.featureFlags`                            | List of developer feature flags                                                                                                                                                                   | `[]`                                                                             |
 | `agents`                                               | Configure multiple agent DaemonSets. Useful when you have different node types and nodeAttestors                                                                                                  | `{}`                                                                             |
-| `tools.kubectl.image.registry`                         | The OCI registry to pull the image from                                                                                                                                                           | `registry.k8s.io`                                                                |
-| `tools.kubectl.image.repository`                       | The repository within the registry                                                                                                                                                                | `kubectl`                                                                        |
+| `tools.kubectl.image.registry`                         | The OCI registry to pull the image from                                                                                                                                                           | `docker.io`                                                                      |
+| `tools.kubectl.image.repository`                       | The repository within the registry                                                                                                                                                                | `rancher/kubectl`                                                                |
 | `tools.kubectl.image.pullPolicy`                       | The image pull policy                                                                                                                                                                             | `IfNotPresent`                                                                   |
 | `tools.kubectl.image.tag`                              | Overrides the image tag whose default is the chart appVersion                                                                                                                                     | `""`                                                                             |
 | `sockets.hostBasePath`                                 | Path on which the agent socket is made available when admin.mountOnHost is true                                                                                                                   | `/run/spire/agent/sockets`                                                       |

charts/spire/charts/spire-agent/templates/configmap.yaml

@@ -19,11 +19,8 @@
 {{-     end }}
 {{-   end }}
 {{- end }}
-{{- if and .Values.keyManager.disk.enabled (ne .Values.persistence.type "hostPath") }}
-{{-   fail "keyManager.disk.enabled is true but persistence.type is not hostPath. Ensure persistence.type is hostPath when keyManager.disk.enabled is true." }}
-{{- end }}
 {{- if hasPrefix (.Values.socketPath | dir | clean) (.Values.sockets.hostBasePath | clean) }}
-{{- fail "The sockets.hostBasePath can not be located under the socketPath directory" }}
+{{- fail "The sockets.hostBasePath can not be located under the socketPath direcotry" }}
 {{- end }}
 {{- end }}
 {{- define "spire-agent.yaml-config" -}}
@@ -41,13 +38,13 @@ agent:
   server_address: {{ include "spire-agent.server-address" . | trim | quote }}
   server_port: {{ .Values.server.port | quote }}
   socket_path: /tmp/spire-agent/public/{{ include "spire-agent.socket-path" . | base }}
-  trust_bundle_format: {{ .Values.trustBundleFormat | quote }}
   {{- if ne (len .Values.trustBundleURL) 0 }}
   trust_bundle_url: {{ .Values.trustBundleURL | quote }}
+  trust_bundle_format: {{ .Values.trustBundleFormat | quote }}
   {{- else if ne (len .Values.trustBundleHostPath) 0 }}
   trust_bundle_path: {{ .Values.trustBundleHostPath | quote }}
   {{- else }}
-  trust_bundle_path: {{ printf "/run/spire/bundle/bundle.%s" (include "spire-lib.trust-bundle-ext" (dict "trustBundleFormat" .Values.trustBundleFormat)) | quote }}
+  trust_bundle_path: "/run/spire/bundle/bundle.crt"
   {{- end }}
   trust_domain: {{ include "spire-lib.trust-domain" . | quote }}
   {{- with .Values.availabilityTarget }}
@@ -64,7 +61,7 @@ agent:
   {{- with .Values.experimental }}
   {{- if eq (.enabled | toString) "true" }}
   experimental:
-    sync_interval: {{ .syncInterval | quote }}
+  sync_interval: {{ .syncInterval | quote }}
     {{- if gt (len .featureFlags) 0 }}
     feature_flags:
       {{- range .featureFlags }}
@@ -107,13 +104,6 @@ plugins:
     {{- $nodeAttestorUsed = add1 $nodeAttestorUsed }}
     {{- end }}
     {{- end }}
-  {{- with .Values.nodeAttestor.awsIID }}
-  {{- if eq (.enabled | toString) "true" }}
-    aws_iid:
-      plugin_data: {}
-    {{- $nodeAttestorUsed = add1 $nodeAttestorUsed }}
-    {{- end }}
-    {{- end }}
 {{- if ne $nodeAttestorUsed 1 }}
 {{- fail (printf "You have to enable exactly one Node Attestor. There are %d enabled." $nodeAttestorUsed) }}
 {{- end }}
@@ -124,12 +114,6 @@ plugins:
       plugin_data:
     {{- $keyManagerUsed = add1 $keyManagerUsed }}
     {{- end }}
-    {{- if .Values.keyManager.disk.enabled }}
-    disk:
-      plugin_data:
-        directory: {{ .Values.persistence.hostPath }}
-    {{- $keyManagerUsed = add1 $keyManagerUsed }}
-    {{- end }}
 {{- if ne $keyManagerUsed 1 }}
 {{- fail (printf "You have to enable exactly one Key Manager. There are %d enabled." $keyManagerUsed) }}
 {{- end }}
@@ -170,13 +154,6 @@ telemetry:
       - host: "0.0.0.0"
         port: {{ .Values.telemetry.prometheus.port }}
 {{- end }}
-
-{{- if .Values.telemetry.datadog.enabled }}
-telemetry:
-  - DogStatsd:
-      - address: "{{ .Values.telemetry.datadog.address }}:{{ .Values.telemetry.datadog.port }}"
-{{- end }}
-
 {{- end }}
 {{- $root := . }}
 {{- range $name := (concat (list "default") (keys .Values.agents)) | uniq }}

charts/spire/charts/spire-agent/templates/daemonset.yaml

@@ -9,9 +9,6 @@
 {{- if hasKey .Values.sds "disableSpiffeCertValidation" }}
 {{-   fail "disableSpiffeCertValidation was renamed to disableSPIFFECertValidation. Please update your config." }}
 {{- end }}
-{{- if and .Values.keyManager.disk.enabled (ne .Values.persistence.type "hostPath") }}
-{{-   fail "keyManager.disk.enabled is true but persistence.type is not hostPath. Ensure persistence.type is hostPath when keyManager.disk.enabled is true." }}
-{{- end }}
 {{- range $name := (concat (list "default") (keys .Values.agents)) | uniq }}
 {{- with (dict "Release" $root.Release "Chart" $root.Chart "Values" (deepCopy $root.Values)) }}
 {{- $nameSuffix := "" }}
@@ -259,11 +256,6 @@ spec:
             - name: spire-config
               mountPath: /opt/spire/conf/agent
               readOnly: true
-            {{- if .Values.keyManager.disk.enabled }}
-            - name: spire-key-manager
-              mountPath: {{ .Values.persistence.hostPath }}
-              readOnly: false
-            {{- end }}
             - name: spire-agent-persistence
               mountPath: /var/lib/spire
             {{- if .Values.sockets.admin.enabled }}
@@ -332,12 +324,6 @@ spec:
         - name: spire-config
           configMap:
             name: {{ include "spire-agent.fullname" . }}
-        {{- if .Values.keyManager.disk.enabled }}
-        - name: spire-key-manager
-          hostPath:
-            path: {{ .Values.persistence.hostPath }}
-            type: DirectoryOrCreate
-        {{- end }}
         {{- if .Values.sockets.admin.mountOnHost }}
         - name: spire-agent-admin-socket-dir
           hostPath:

charts/spire/charts/spire-agent/values.yaml

@@ -94,7 +94,7 @@ trustDomain: example.org
 ## @param trustBundleURL If set, obtain trust bundle from url instead of Kubernetes ConfigMap
 trustBundleURL: ""
 ## @param trustBundleFormat If using trustBundleURL, what format is the url. Choices are "pem" and "spiffe"
-trustBundleFormat: spiffe
+trustBundleFormat: pem
 ## @param trustBundleHostPath If set, obtain trust bundle from a file on the host instead of from the ConfigMap
 trustBundleHostPath: ""
 ## @param bundleConfigMap Configmap name for Spire bundle
@@ -153,7 +153,7 @@ fsGroupFix:
     registry: cgr.dev
     repository: chainguard/bash
     pullPolicy: Always
-    tag: latest@sha256:330ad2ea11cf3018a331326fb08e44cedd0c0c604cfbfcff32b81272460bb679
+    tag: latest@sha256:a5cd47a3caf0668c48c6ad4bb66436cab40aa335634f3b5740ffd2a0c39770b2
 
   ## @param fsGroupFix.resources Specify resource needs as per https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
   resources: {}
@@ -162,9 +162,6 @@ keyManager:
   memory:
     ## @param keyManager.memory.enabled Enable the memory based Key Manager
     enabled: true
-  disk:
-    ## @param keyManager.disk.enabled Enable the disk based Key Manager (must have persistence.type set to hostPath when enabled)
-    enabled: false
 
 nodeAttestor:
   k8sPSAT:
@@ -189,12 +186,12 @@ nodeAttestor:
       ## @param nodeAttestor.tpmDirect.plugin.image.tag Overrides the image tag
       ##
       image:
-        registry: ghcr.io
-        repository: spiffe/spire-tpm-plugin-tpm-attestor-agent
+        registry: docker.io
+        repository: boxboat/spire-tpm-plugin-tpm-attestor-agent
         pullPolicy: IfNotPresent
-        tag: "v1.9.0"
+        tag: "v1.8.7"
       ## @param nodeAttestor.tpmDirect.plugin.checksum The sha256 checksum of the plugin binary
-      checksum: 22f67063f1699330e70cdedc9b923e517688f5ae71085a26bd9b83b3060ee86e
+      checksum: 1d7c73ccac948ee86cbd78ddde2d30128a1838b403f7bb2100d38d916a252244
       ## @param nodeAttestor.tpmDirect.plugin.path The filename in the container of the plugin
       path: /app/tpm_attestor_agent
     pubHash:
@@ -206,13 +203,10 @@ nodeAttestor:
       ## @param nodeAttestor.tpmDirect.pubHash.image.tag Overrides the image tag
       ##
       image:
-        registry: ghcr.io
-        repository: spiffe/spire-tpm-plugin-get-tpm-pubhash
+        registry: docker.io
+        repository: boxboat/spire-tpm-plugin-get-tpm-pubhash
         pullPolicy: IfNotPresent
-        tag: "v1.9.0"
-  awsIID:
-    ## @param nodeAttestor.awsIID.enabled Enable the aws_iid Node Attestor
-    enabled: false
+        tag: "v1.8.7"
 
 # workloadAttestors determine a workload's properties and then generate a set of selectors associated with it.
 workloadAttestors:
@@ -263,13 +257,6 @@ telemetry:
       namespace: ""
       ## @param telemetry.prometheus.podMonitor.labels [object] Pod labels to filter for prometheus monitoring
       labels: {}
-  datadog:
-    ## @param telemetry.datadog.enabled Flag to enable datadog monitoring
-    enabled: false
-    ## @param telemetry.datadog.address The address of the datadog service to send metrics to. The default URL for services are `<service-name>.<namespace>.svc`
-    address: "datadog.kube-system.svc"
-    ## @param telemetry.datadog.port The port of the datadog service to send metrics to
-    port: 8125
 
 ## @param kubeletConnectByHostname If true, connect to kubelet using the nodes hostname. If false, uses localhost. If unset, defaults to true on OpenShift and false otherwise.
 kubeletConnectByHostname: ""
@@ -293,7 +280,7 @@ socketAlternate:
     registry: cgr.dev
     repository: chainguard/bash
     pullPolicy: Always
-    tag: latest@sha256:330ad2ea11cf3018a331326fb08e44cedd0c0c604cfbfcff32b81272460bb679
+    tag: latest@sha256:a5cd47a3caf0668c48c6ad4bb66436cab40aa335634f3b5740ffd2a0c39770b2
 
   ## @param socketAlternate.resources Specify resource needs as per https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
   resources: {}
@@ -308,7 +295,7 @@ hostCert:
     registry: cgr.dev
     repository: chainguard/min-toolkit-debug
     pullPolicy: IfNotPresent
-    tag: latest@sha256:f662d2b8c7c47e6d29c31b1bc8dbd039770d6186295bbc88bd8f540ca8ec3b53
+    tag: latest@sha256:424ac4637dac08a4594643b548d9af10144dcd6360b4b319a4c143841bf0bfee
 
   ## @param hostCert.resources Specify resource needs as per https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
   resources: {}
@@ -383,8 +370,8 @@ tools:
     ## @param tools.kubectl.image.tag Overrides the image tag whose default is the chart appVersion
     ##
     image:
-      registry: registry.k8s.io
-      repository: kubectl
+      registry: docker.io
+      repository: rancher/kubectl
       pullPolicy: IfNotPresent
       tag: ""
 

charts/spire/charts/spire-lib/templates/_helpers.tpl

@@ -53,7 +53,7 @@
 {{- $repo := .image.repository }}
 {{- $tag := .image.tag | toString }}
 {{- if eq (substr 0 7 $tag) "sha256:" }}
-{{- printf "%s%s@%s" $registry $repo $tag | quote }}
+{{- printf "%s/%s@%s" $registry $repo $tag | quote }}
 {{- else if .appVersion }}
 {{- $appVersion := .appVersion }}
 {{- if and (hasKey . "ubi") (dig "openshift" false .global) }}
@@ -336,11 +336,3 @@ Anything lower has an incompatible API.
 {{- fail "Unsupported autoscaling API version" }}
 {{- end }}
 {{- end }}
-
-{{- define "spire-lib.trust-bundle-ext" -}}
-{{- if eq .trustBundleFormat "spiffe" }}
-{{- print "spiffe" }}
-{{- else }}
-{{- print "crt" }}
-{{- end }}
-{{- end }}

charts/spire/charts/spire-server/Chart.yaml

@@ -3,7 +3,7 @@ name: spire-server
 description: A Helm chart to install the SPIRE server.
 type: application
 version: 0.1.0
-appVersion: "1.12.4"
+appVersion: "1.11.0"
 keywords: ["spiffe", "spire-server", "spire-controller-manager"]
 home: https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spire
 sources:

charts/spire/charts/spire-server/README.md

@@ -131,8 +131,7 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr
 | `dataStore.sql.port`                                                                         | If 0 (default), it will auto set to 5432 for postgres and 3306 for mysql. Only used by those databases.                                                                                                                                                                                                                                                              | `0`                                                                                            |
 | `dataStore.sql.username`                                                                     | Only used when type != "sqlite3"                                                                                                                                                                                                                                                                                                                                     | `spire`                                                                                        |
 | `dataStore.sql.password`                                                                     | Only used when type != "sqlite3"                                                                                                                                                                                                                                                                                                                                     | `""`                                                                                           |
-| `dataStore.sql.file`                                                                         | Data source file. Only used when type == "sqlite3"                                                                                                                                                                                                                                                                                                                   | `/run/spire/data/datastore.sqlite3`                                                            |
-| `dataStore.sql.options`                                                                      | takes an array of objects of form {<key>: <value>} to use when building the database connection string                                                                                                                                                                                                                                                               | `[]`                                                                                           |
+| `dataStore.sql.options`                                                                      | Only used when type != "sqlite3"                                                                                                                                                                                                                                                                                                                                     | `[]`                                                                                           |
 | `dataStore.sql.rootCAPath`                                                                   | Path to Root CA bundle (MySQL only)                                                                                                                                                                                                                                                                                                                                  | `""`                                                                                           |
 | `dataStore.sql.clientCertPath`                                                               | Path to client certificate (MySQL only)                                                                                                                                                                                                                                                                                                                              | `""`                                                                                           |
 | `dataStore.sql.clientKeyPath`                                                                | Path to private key for client certificate (MySQL only)                                                                                                                                                                                                                                                                                                              | `""`                                                                                           |
@@ -159,7 +158,7 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr
 | `jwtIssuer`                                                                                  | The JWT issuer domain. Defaults to oidc-discovery.$trustDomain if unset                                                                                                                                                                                                                                                                                              | `""`                                                                                           |
 | `clusterName`                                                                                | Set the name of the Kubernetes cluster. (`kubeadm init --service-dns-domain`)                                                                                                                                                                                                                                                                                        | `example-cluster`                                                                              |
 | `trustDomain`                                                                                | Set the trust domain to be used for the SPIFFE identifiers                                                                                                                                                                                                                                                                                                           | `example.org`                                                                                  |
-| `bundleConfigMap`                                                                            | Set the Configmap name for SPIRE bundle                                                                                                                                                                                                                                                                                                                              | `spire-bundle`                                                                                 |
+| `bundleConfigMap`                                                                            | Set the trust domain to be used for the SPIFFE identifiers                                                                                                                                                                                                                                                                                                           | `spire-bundle`                                                                                 |
 | `clusterDomain`                                                                              | This is the value of your clusters `kubeadm init --service-dns-domain` flag                                                                                                                                                                                                                                                                                          | `cluster.local`                                                                                |
 | `federation.enabled`                                                                         | Flag to enable federation                                                                                                                                                                                                                                                                                                                                            | `false`                                                                                        |
 | `federation.bundleEndpoint.port`                                                             | Port value for trust bundle federation                                                                                                                                                                                                                                                                                                                               | `8443`                                                                                         |
@@ -189,14 +188,6 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr
 | `caSubject.country`                                                                          | Country for Spire server CA                                                                                                                                                                                                                                                                                                                                          | `ARPA`                                                                                         |
 | `caSubject.organization`                                                                     | Organization for Spire server CA                                                                                                                                                                                                                                                                                                                                     | `Example`                                                                                      |
 | `caSubject.commonName`                                                                       | Common Name for Spire server CA                                                                                                                                                                                                                                                                                                                                      | `example.org`                                                                                  |
-| `credentialComposer.cel.enabled`                                                             | Enable the cel based credential composer                                                                                                                                                                                                                                                                                                                             | `false`                                                                                        |
-| `credentialComposer.cel.image.registry`                                                      | The OCI registry to pull the image from                                                                                                                                                                                                                                                                                                                              | `ghcr.io`                                                                                      |
-| `credentialComposer.cel.image.repository`                                                    | The repository within the registry                                                                                                                                                                                                                                                                                                                                   | `spiffe/spire-credentialcomposer-cel`                                                          |
-| `credentialComposer.cel.image.pullPolicy`                                                    | The image pull policy                                                                                                                                                                                                                                                                                                                                                | `IfNotPresent`                                                                                 |
-| `credentialComposer.cel.image.tag`                                                           | Overrides the image tag                                                                                                                                                                                                                                                                                                                                              | `0.0.2`                                                                                        |
-| `credentialComposer.cel.checksum`                                                            | The sha256 checksum of the plugin binary                                                                                                                                                                                                                                                                                                                             | `23fa1d10f15ad5d5c555930cf82289c664801d7d5609bfd8847f95a0a667e4e4`                             |
-| `credentialComposer.cel.pluginPath`                                                          | The filename in the container of the plugin                                                                                                                                                                                                                                                                                                                          | `/ko-app/cmd`                                                                                  |
-| `credentialComposer.cel.jwt.expression`                                                      | The expression to use for jwt token composing                                                                                                                                                                                                                                                                                                                        | `""`                                                                                           |
 | `credentialComposer.uniqueID.enabled`                                                        | Add the x509UniqueIdentifier attribute to workload X509-SVIDs                                                                                                                                                                                                                                                                                                        | `false`                                                                                        |
 | `keyManager.disk.enabled`                                                                    | Flag to enable keyManager on disk                                                                                                                                                                                                                                                                                                                                    | `true`                                                                                         |
 | `keyManager.memory.enabled`                                                                  | Flag to enable keyManager in memory                                                                                                                                                                                                                                                                                                                                  | `false`                                                                                        |
@@ -256,17 +247,14 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr
 | `upstreamAuthority.vault.k8sAuth.k8sAuthRoleName`                                            | Required - Name of the Vault role. The plugin authenticates against the named role                                                                                                                                                                                                                                                                                   | `""`                                                                                           |
 | `upstreamAuthority.vault.k8sAuth.token.audience`                                             | Intended audience of the PSAT, it must match one of the audiences supported by the Kubernetes API server. If no audience is specified, it defaults to the identifier of API Server. See ['Service Account Documentation'](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#serviceaccount-token-volume-projection) for more info. | `vault`                                                                                        |
 | `upstreamAuthority.vault.k8sAuth.token.expiry`                                               | Expiry time in seconds for the token                                                                                                                                                                                                                                                                                                                                 | `7200`                                                                                         |
-| `notifier.k8sBundle.enabled`                                                                 | Enable local k8s bundle uploader                                                                                                                                                                                                                                                                                                                                     | `false`                                                                                        |
+| `notifier.k8sBundle.enabled`                                                                 | Enable local k8s bundle uploader                                                                                                                                                                                                                                                                                                                                     | `true`                                                                                         |
 | `notifier.k8sBundle.namespace`                                                               | Namespace to push the bundle into, if blank will default to SPIRE Server namespace                                                                                                                                                                                                                                                                                   | `""`                                                                                           |
-| `notifier.k8sBundle.apiServiceLabel`                                                         | If set, rotate the CA Bundle in API services with this label set to true.                                                                                                                                                                                                                                                                                            | `""`                                                                                           |
-| `notifier.k8sBundle.webhookLabel`                                                            | If set, rotate the CA Bundle in validating and mutating webhooks with this label set to true.                                                                                                                                                                                                                                                                        | `""`                                                                                           |
-| `notifier.externalK8sBundle.enabled`                                                         | Enable external k8s bundle uploader                                                                                                                                                                                                                                                                                                                                  | `false`                                                                                        |
+| `notifier.externalK8sBundle.enabled`                                                         | Enable external k8s bundle uploader                                                                                                                                                                                                                                                                                                                                  | `true`                                                                                         |
 | `notifier.externalK8sBundle.defaults.namespace`                                              | Namespace to push the bundle into on clusters                                                                                                                                                                                                                                                                                                                        | `spire-system`                                                                                 |
 | `notifier.externalK8sBundle.defaults.configMap`                                              | ConfigMap name to push the bundle into on external clusters                                                                                                                                                                                                                                                                                                          | `spire-bundle-upstream`                                                                        |
 | `notifier.externalK8sBundle.defaults.configMapKey`                                           | ConfigMap key to push the bundle into on external clusters                                                                                                                                                                                                                                                                                                           | `bundle.crt`                                                                                   |
 | `notifier.externalK8sBundle.clusters`                                                        | A dictionary of clusters to add with optional overrides. If empty, all clusters defined in kubeConfigs will be used.                                                                                                                                                                                                                                                 | `{}`                                                                                           |
 | `controllerManager.enabled`                                                                  | Flag to enable controller manager                                                                                                                                                                                                                                                                                                                                    | `false`                                                                                        |
-| `controllerManager.staticManifestMode`                                                       | Flag to configure static mode. Valid options off, internal, and external. If internal, the identities config options will be rendered to an included configmap                                                                                                                                                                                                       | `off`                                                                                          |
 | `controllerManager.className`                                                                | specify to use an explicit class name. If empty, it will be automatically set to Release.Namespace-Release.Name to not conflict with other installs, enabling parallel installs.                                                                                                                                                                                     | `""`                                                                                           |
 | `controllerManager.watchClassless`                                                           | specify to process custom resources without class name specified. Useful to slowly migrate to class names from classless installs. Do not have two installs on the same k8s cluster both set to true.                                                                                                                                                                | `false`                                                                                        |
 | `controllerManager.entryIDPrefixCleanup`                                                     | Sets which entry prefixes to remove for migrations. Consult the spiffe.io docs about this option before changing. Its unlikely you will need to ever change it.                                                                                                                                                                                                      | `false`                                                                                        |
@@ -278,7 +266,7 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr
 | `controllerManager.image.registry`                                                           | The OCI registry to pull the image from                                                                                                                                                                                                                                                                                                                              | `ghcr.io`                                                                                      |
 | `controllerManager.image.repository`                                                         | The repository within the registry                                                                                                                                                                                                                                                                                                                                   | `spiffe/spire-controller-manager`                                                              |
 | `controllerManager.image.pullPolicy`                                                         | The image pull policy                                                                                                                                                                                                                                                                                                                                                | `IfNotPresent`                                                                                 |
-| `controllerManager.image.tag`                                                                | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                                                                                                                                                        | `0.6.2`                                                                                        |
+| `controllerManager.image.tag`                                                                | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                                                                                                                                                        | `0.6.0`                                                                                        |
 | `controllerManager.resources`                                                                | Resource requests and limits for controller manager                                                                                                                                                                                                                                                                                                                  | `{}`                                                                                           |
 | `controllerManager.securityContext`                                                          | Security context                                                                                                                                                                                                                                                                                                                                                     | `{}`                                                                                           |
 | `controllerManager.service.type`                                                             | Service type for controller manager                                                                                                                                                                                                                                                                                                                                  | `ClusterIP`                                                                                    |
@@ -311,15 +299,6 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr
 | `controllerManager.identities.clusterSPIFFEIDs.oidc-discovery-provider.dnsNameTemplates`     | DNS name template for issued identities                                                                                                                                                                                                                                                                                                                              | `[]`                                                                                           |
 | `controllerManager.identities.clusterSPIFFEIDs.test-keys.enabled`                            | Enable this identity for controller manager                                                                                                                                                                                                                                                                                                                          | `true`                                                                                         |
 | `controllerManager.identities.clusterSPIFFEIDs.test-keys.type`                               | The type of rule this is.                                                                                                                                                                                                                                                                                                                                            | `test-keys`                                                                                    |
-| `controllerManager.identities.clusterSPIFFEIDs.spike-keeper.enabled`                         | Enable this identity for controller manager                                                                                                                                                                                                                                                                                                                          | `true`                                                                                         |
-| `controllerManager.identities.clusterSPIFFEIDs.spike-keeper.type`                            | The type of rule this is.                                                                                                                                                                                                                                                                                                                                            | `spike-keeper`                                                                                 |
-| `controllerManager.identities.clusterSPIFFEIDs.spike-keeper.spiffeIDTemplate`                | The template to use for this rule.                                                                                                                                                                                                                                                                                                                                   | `spiffe://{{ .TrustDomain }}/spike/keeper`                                                     |
-| `controllerManager.identities.clusterSPIFFEIDs.spike-nexus.enabled`                          | Enable this identity for controller manager                                                                                                                                                                                                                                                                                                                          | `true`                                                                                         |
-| `controllerManager.identities.clusterSPIFFEIDs.spike-nexus.type`                             | The type of rule this is.                                                                                                                                                                                                                                                                                                                                            | `spike-nexus`                                                                                  |
-| `controllerManager.identities.clusterSPIFFEIDs.spike-nexus.spiffeIDTemplate`                 | The template to use for this rule.                                                                                                                                                                                                                                                                                                                                   | `spiffe://{{ .TrustDomain }}/spike/nexus`                                                      |
-| `controllerManager.identities.clusterSPIFFEIDs.spike-pilot.enabled`                          | Enable this identity for controller manager                                                                                                                                                                                                                                                                                                                          | `true`                                                                                         |
-| `controllerManager.identities.clusterSPIFFEIDs.spike-pilot.type`                             | The type of rule this is.                                                                                                                                                                                                                                                                                                                                            | `spike-pilot`                                                                                  |
-| `controllerManager.identities.clusterSPIFFEIDs.spike-pilot.spiffeIDTemplate`                 | The template to use for this rule.                                                                                                                                                                                                                                                                                                                                   | `spiffe://{{ .TrustDomain }}/spike/pilot/role/superuser`                                       |
 | `controllerManager.identities.clusterStaticEntries`                                          | Specify ClusterStaticEntry objects.                                                                                                                                                                                                                                                                                                                                  | `{}`                                                                                           |
 | `controllerManager.identities.clusterFederatedTrustDomains`                                  | Specify ClusterFederatedTrustDomain objects.                                                                                                                                                                                                                                                                                                                         | `{}`                                                                                           |
 | `controllerManager.validatingWebhookConfiguration.enabled`                                   | Disable only when you have another chart instance on the k8s cluster with webhooks enabled.                                                                                                                                                                                                                                                                          | `true`                                                                                         |
@@ -341,21 +320,14 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr
 | `externalControllerManagers.defaults.ignoreNamespaces`                                       | These namespaces are ignored by controller manager                                                                                                                                                                                                                                                                                                                   | `[]`                                                                                           |
 | `externalControllerManagers.defaults.cacheNamespaces`                                        | If specified restricts the manager's cache to watch objects in the desired namespaces. Defaults to all namespaces.                                                                                                                                                                                                                                                   | `{}`                                                                                           |
 | `externalControllerManagers.clusters`                                                        | A dictionary of clusters to add with optional overrides. If empty, all clusters defined in kubeConfigs will be used.                                                                                                                                                                                                                                                 | `{}`                                                                                           |
-| `tools.kubectl.image.registry`                                                               | The OCI registry to pull the image from                                                                                                                                                                                                                                                                                                                              | `registry.k8s.io`                                                                              |
-| `tools.kubectl.image.repository`                                                             | The repository within the registry                                                                                                                                                                                                                                                                                                                                   | `kubectl`                                                                                      |
+| `tools.kubectl.image.registry`                                                               | The OCI registry to pull the image from                                                                                                                                                                                                                                                                                                                              | `docker.io`                                                                                    |
+| `tools.kubectl.image.repository`                                                             | The repository within the registry                                                                                                                                                                                                                                                                                                                                   | `rancher/kubectl`                                                                              |
 | `tools.kubectl.image.pullPolicy`                                                             | The image pull policy                                                                                                                                                                                                                                                                                                                                                | `IfNotPresent`                                                                                 |
 | `tools.kubectl.image.tag`                                                                    | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                                                                                                                                                        | `""`                                                                                           |
-| `tools.busybox.image.registry`                                                               | The OCI registry to pull the image from                                                                                                                                                                                                                                                                                                                              | `""`                                                                                           |
-| `tools.busybox.image.repository`                                                             | The repository within the registry                                                                                                                                                                                                                                                                                                                                   | `busybox`                                                                                      |
-| `tools.busybox.image.pullPolicy`                                                             | The image pull policy                                                                                                                                                                                                                                                                                                                                                | `IfNotPresent`                                                                                 |
-| `tools.busybox.image.tag`                                                                    | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                                                                                                                                                        | `1.37.0-uclibc`                                                                                |
 | `telemetry.prometheus.enabled`                                                               | Flag to enable prometheus monitoring                                                                                                                                                                                                                                                                                                                                 | `false`                                                                                        |
 | `telemetry.prometheus.podMonitor.enabled`                                                    | Enable podMonitor for prometheus                                                                                                                                                                                                                                                                                                                                     | `false`                                                                                        |
 | `telemetry.prometheus.podMonitor.namespace`                                                  | Override where to install the podMonitor, if not set will use the same namespace as the spire-agent                                                                                                                                                                                                                                                                  | `""`                                                                                           |
 | `telemetry.prometheus.podMonitor.labels`                                                     | Pod labels to filter for prometheus monitoring                                                                                                                                                                                                                                                                                                                       | `{}`                                                                                           |
-| `telemetry.datadog.enabled`                                                                  | Flag to enable datadog monitoring                                                                                                                                                                                                                                                                                                                                    | `false`                                                                                        |
-| `telemetry.datadog.address`                                                                  | The address of the datadog service to send metrics to. The default URL for services are `<service-name>.<namespace>.svc`                                                                                                                                                                                                                                             | `datadog.kube-system.svc`                                                                      |
-| `telemetry.datadog.port`                                                                     | The port of the datadog service to send metrics to                                                                                                                                                                                                                                                                                                                   | `8125`                                                                                         |
 | `ingress.enabled`                                                                            | Flag to enable ingress                                                                                                                                                                                                                                                                                                                                               | `false`                                                                                        |
 | `ingress.className`                                                                          | Ingress class name                                                                                                                                                                                                                                                                                                                                                   | `""`                                                                                           |
 | `ingress.controllerType`                                                                     | Specify what type of ingress controller you're using to add the necessary annotations accordingly. If blank, autodetection is attempted. If other, no annotations will be added. Must be one of [ingress-nginx, openshift, other, ""].                                                                                                                               | `""`                                                                                           |
@@ -371,7 +343,6 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr
 | `initContainers`                                                                             | Additional init containers to create                                                                                                                                                                                                                                                                                                                                 | `[]`                                                                                           |
 | `caKeyType`                                                                                  | The CA key type to use, possible values are rsa-2048, rsa-4096, ec-p256, ec-p384 (AWS requires the use of RSA. EC cryptography is not supported)                                                                                                                                                                                                                     | `rsa-2048`                                                                                     |
 | `caTTL`                                                                                      | TTL for CA                                                                                                                                                                                                                                                                                                                                                           | `24h`                                                                                          |
-| `agentTTL`                                                                                   | The TTL to use for agent SVIDs. If unset, the defaultX509SvidTTL will be used.                                                                                                                                                                                                                                                                                       | `""`                                                                                           |
 | `defaultX509SvidTTL`                                                                         | TTL for X509 Svids                                                                                                                                                                                                                                                                                                                                                   | `4h`                                                                                           |
 | `defaultJwtSvidTTL`                                                                          | TTL for JWT Svids                                                                                                                                                                                                                                                                                                                                                    | `1h`                                                                                           |
 | `nodeAttestor.k8sPSAT.enabled`                                                               | Enable PSAT k8s nodeattestor                                                                                                                                                                                                                                                                                                                                         | `true`                                                                                         |
@@ -392,30 +363,18 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr
 | `nodeAttestor.httpChallenge.allowNonRootPorts`                                               | Allow using ports >= 1024 from clients for attestation                                                                                                                                                                                                                                                                                                               | `true`                                                                                         |
 | `nodeAttestor.httpChallenge.tofu`                                                            | Trust on first use of the successful challenge. Can only be disabled if allowNonRootPorts=false or requiredPort < 1024                                                                                                                                                                                                                                               | `true`                                                                                         |
 | `nodeAttestor.tpmDirect.enabled`                                                             | Enable the direct TPM node attestor, a 3rd party plugin by Boxboat. This plugin is experimental.                                                                                                                                                                                                                                                                     | `false`                                                                                        |
-| `nodeAttestor.tpmDirect.image.registry`                                                      | The OCI registry to pull the image from                                                                                                                                                                                                                                                                                                                              | `ghcr.io`                                                                                      |
-| `nodeAttestor.tpmDirect.image.repository`                                                    | The repository within the registry                                                                                                                                                                                                                                                                                                                                   | `spiffe/spire-tpm-plugin-tpm-attestor-server`                                                  |
+| `nodeAttestor.tpmDirect.image.registry`                                                      | The OCI registry to pull the image from                                                                                                                                                                                                                                                                                                                              | `docker.io`                                                                                    |
+| `nodeAttestor.tpmDirect.image.repository`                                                    | The repository within the registry                                                                                                                                                                                                                                                                                                                                   | `boxboat/spire-tpm-plugin-tpm-attestor-server`                                                 |
 | `nodeAttestor.tpmDirect.image.pullPolicy`                                                    | The image pull policy                                                                                                                                                                                                                                                                                                                                                | `IfNotPresent`                                                                                 |
-| `nodeAttestor.tpmDirect.image.tag`                                                           | Overrides the image tag                                                                                                                                                                                                                                                                                                                                              | `v1.9.0`                                                                                       |
-| `nodeAttestor.tpmDirect.checksum`                                                            | The sha256 checksum of the plugin binary                                                                                                                                                                                                                                                                                                                             | `46d0caad8c25a027dd11c93e18b58a8bc6fbd9f1fe2e36fa2a0dd440986de4dc`                             |
+| `nodeAttestor.tpmDirect.image.tag`                                                           | Overrides the image tag                                                                                                                                                                                                                                                                                                                                              | `v1.8.7`                                                                                       |
+| `nodeAttestor.tpmDirect.checksum`                                                            | The sha256 checksum of the plugin binary                                                                                                                                                                                                                                                                                                                             | `f39ef9cdd2b3dd74112bfe827b79d6721c59215d0d5f4c2e34fa09bbc60d36d2`                             |
 | `nodeAttestor.tpmDirect.pluginPath`                                                          | The filename in the container of the plugin                                                                                                                                                                                                                                                                                                                          | `/app/tpm_attestor_server`                                                                     |
 | `nodeAttestor.tpmDirect.cas`                                                                 | A dictionary of TPM CA PEM or DER files that are allowed to connect.                                                                                                                                                                                                                                                                                                 | `{}`                                                                                           |
 | `nodeAttestor.tpmDirect.hashes`                                                              | A list of TPM hashes that are allowed to connect.                                                                                                                                                                                                                                                                                                                    | `[]`                                                                                           |
-| `nodeAttestor.awsIID.enabled`                                                                | Enable the aws_iid node attestor                                                                                                                                                                                                                                                                                                                                     | `false`                                                                                        |
-| `nodeAttestor.awsIID.assumeRole`                                                             | AWS IAM Role NAME to use for the attestation                                                                                                                                                                                                                                                                                                                         | `""`                                                                                           |
-| `bundlePublisher.k8sConfigMap.enabled`                                                       | Enable local k8s bundle uploader                                                                                                                                                                                                                                                                                                                                     | `true`                                                                                         |
-| `bundlePublisher.k8sConfigMap.namespace`                                                     | Namespace to push the bundle into, if blank will default to SPIRE Server namespace                                                                                                                                                                                                                                                                                   | `""`                                                                                           |
-| `bundlePublisher.k8sConfigMap.format`                                                        | Format of the trust bundle. Can be pem or spiffe                                                                                                                                                                                                                                                                                                                     | `spiffe`                                                                                       |
-| `bundlePublisher.externalK8sConfigMap.enabled`                                               | Enable external k8s bundle uploader                                                                                                                                                                                                                                                                                                                                  | `true`                                                                                         |
-| `bundlePublisher.externalK8sConfigMap.defaults.namespace`                                    | Namespace to push the bundle into on clusters                                                                                                                                                                                                                                                                                                                        | `spire-system`                                                                                 |
-| `bundlePublisher.externalK8sConfigMap.defaults.configMapName`                                | ConfigMap name to push the bundle into on external clusters                                                                                                                                                                                                                                                                                                          | `spire-bundle-upstream`                                                                        |
-| `bundlePublisher.externalK8sConfigMap.defaults.configMapKey`                                 | ConfigMap key to push the bundle into on external clusters                                                                                                                                                                                                                                                                                                           | `""`                                                                                           |
-| `bundlePublisher.externalK8sConfigMap.defaults.format`                                       | Format of the trust bundle. Can be pem or spiffe                                                                                                                                                                                                                                                                                                                     | `spiffe`                                                                                       |
-| `bundlePublisher.externalK8sConfigMap.clusters`                                              | A dictionary of clusters to add with optional overrides. If empty, all clusters defined in kubeConfigs will be used.                                                                                                                                                                                                                                                 | `{}`                                                                                           |
 | `bundlePublisher.awsRolesAnywhereTrustAnchor.enabled`                                        | Enable the AWS S3 bundle publisher                                                                                                                                                                                                                                                                                                                                   | `false`                                                                                        |
 | `bundlePublisher.awsRolesAnywhereTrustAnchor.region`                                         | AWS region to store the trust bundle                                                                                                                                                                                                                                                                                                                                 | `""`                                                                                           |
 | `bundlePublisher.awsRolesAnywhereTrustAnchor.trustAnchorID`                                  | AWS trust anchor ID to publish to                                                                                                                                                                                                                                                                                                                                    | `""`                                                                                           |
 | `bundlePublisher.awsS3.enabled`                                                              | Enable the AWS S3 bundle publisher                                                                                                                                                                                                                                                                                                                                   | `false`                                                                                        |
-| `bundlePublisher.awsS3.endpoint`                                                             | A custom S3 endpoint should be set when using third-party object storage providers, such as Minio.                                                                                                                                                                                                                                                                   | `""`                                                                                           |
 | `bundlePublisher.awsS3.region`                                                               | AWS region to store the trust bundle                                                                                                                                                                                                                                                                                                                                 | `""`                                                                                           |
 | `bundlePublisher.awsS3.bucket`                                                               | AWS S3 bucket name to which the trust bundle is uploaded                                                                                                                                                                                                                                                                                                             | `""`                                                                                           |
 | `bundlePublisher.awsS3.objectKey`                                                            | AWS S3 object key inside the bucket                                                                                                                                                                                                                                                                                                                                  | `""`                                                                                           |
@@ -434,7 +393,7 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr
 | `tornjak.image.repository`                 | The repository within the registry                                                                                                                                                                                                     | `spiffe/tornjak-backend`                                                         |
 | `tornjak.image.pullPolicy`                 | The image pull policy                                                                                                                                                                                                                  | `IfNotPresent`                                                                   |
 | `tornjak.image.tag`                        | Overrides the image tag to be whatever you need it to be. It will always be the flag you set without modifications                                                                                                                     | `""`                                                                             |
-| `tornjak.image.defaultTag`                 | Sets the default image to use when image.tag is not set. It will automatically be updated with a ubi- prefix if on OpenShift.                                                                                                          | `v2.1.0`                                                                         |
+| `tornjak.image.defaultTag`                 | Sets the default image to use when image.tag is not set. It will automatically be updated with a ubi- prefix if on OpenShift.                                                                                                          | `v1.6.0`                                                                         |
 | `tornjak.service.type`                     | Type of service resource                                                                                                                                                                                                               | `ClusterIP`                                                                      |
 | `tornjak.service.ports.http`               | Insecure port for tornjak service                                                                                                                                                                                                      | `10000`                                                                          |
 | `tornjak.service.ports.https`              | Secure port for tornjak service                                                                                                                                                                                                        | `10443`                                                                          |
@@ -472,10 +431,10 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr
 | `customPlugins.nodeAttestor`               | Custom plugins of type NodeAttestor are configured here                                                                                                                                                                                | `{}`                                                                             |
 | `customPlugins.upstreamAuthority`          | Custom plugins of type upstreamAuthority are configured here                                                                                                                                                                           | `{}`                                                                             |
 | `customPlugins.notifier`                   | Custom plugins of type notifier are configured here                                                                                                                                                                                    | `{}`                                                                             |
-| `chown.image.registry`                     | The OCI registry to pull the image from                                                                                                                                                                                                | `""`                                                                             |
-| `chown.image.repository`                   | The repository within the registry                                                                                                                                                                                                     | `busybox`                                                                        |
+| `chown.image.registry`                     | The OCI registry to pull the image from                                                                                                                                                                                                | `cgr.dev`                                                                        |
+| `chown.image.repository`                   | The repository within the registry                                                                                                                                                                                                     | `chainguard/bash`                                                                |
 | `chown.image.pullPolicy`                   | The image pull policy                                                                                                                                                                                                                  | `Always`                                                                         |
-| `chown.image.tag`                          | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                          | `1.37.0-uclibc`                                                                  |
+| `chown.image.tag`                          | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                          | `latest@sha256:a5cd47a3caf0668c48c6ad4bb66436cab40aa335634f3b5740ffd2a0c39770b2` |
 | `chown.resources`                          | Specify resource needs as per https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/                                                                                                                           | `{}`                                                                             |
 | `experimental.enabled`                     | Allow configuration of experimental features                                                                                                                                                                                           | `false`                                                                          |
 | `experimental.cacheReloadInterval`         | The amount of time between two reloads of the in-memory entry cache.                                                                                                                                                                   | `5s`                                                                             |
@@ -488,5 +447,5 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr
 | `tests.bash.image.registry`                | The OCI registry to pull the image from                                                                                                                                                                                                | `cgr.dev`                                                                        |
 | `tests.bash.image.repository`              | The repository within the registry                                                                                                                                                                                                     | `chainguard/bash`                                                                |
 | `tests.bash.image.pullPolicy`              | The image pull policy                                                                                                                                                                                                                  | `IfNotPresent`                                                                   |
-| `tests.bash.image.tag`                     | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                          | `latest@sha256:330ad2ea11cf3018a331326fb08e44cedd0c0c604cfbfcff32b81272460bb679` |
+| `tests.bash.image.tag`                     | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                          | `latest@sha256:a5cd47a3caf0668c48c6ad4bb66436cab40aa335634f3b5740ffd2a0c39770b2` |
 | `kubeConfigs`                              | Manage additional kubeconfig files to talk to external Kubernetes clusters                                                                                                                                                             | `{}`                                                                             |

charts/spire/charts/spire-server/templates/_controller-manager-container.tpl

@@ -75,11 +75,7 @@
     {{- end }}
   env:
     - name: ENABLE_WEBHOOKS
-    {{- if eq .Values.controllerManager.staticManifestMode "off" }}
       value: {{ .webhooksEnabled | toString | quote }}
-    {{- else }}
-      value: "false"
-    {{- end }}
   {{- if gt (len $extraEnv) 0 }}
   {{-   $extraEnv | toYaml | nindent 4 }}
   {{- end }}
@@ -95,7 +91,6 @@
     - containerPort: {{ $promPort }}
       name: prom-cm{{ .suffix }}
     {{- end }}
-{{- if eq .Values.controllerManager.staticManifestMode "off" }}
   livenessProbe:
     httpGet:
       path: /healthz
@@ -104,17 +99,12 @@
     httpGet:
       path: /readyz
       port: healthz
-{{- end }}
   resources:
     {{- toYaml .Values.controllerManager.resources | nindent 4 }}
   volumeMounts:
     - name: spire-server-socket
       mountPath: /tmp/spire-server/private
       readOnly: true
-    {{- if ne .Values.controllerManager.staticManifestMode "off" }}
-    - name: controller-manager-static-config
-      mountPath: /manifests
-    {{- end }}
     - name: controller-manager-config
       mountPath: /controller-manager-config{{ .suffix }}.yaml
       subPath: controller-manager-config{{ .suffix }}.yaml

charts/spire/charts/spire-server/templates/_helpers.tpl

@@ -65,45 +65,21 @@ Allow the release namespace to be overridden for multi-namespace deployments in
   {{- end -}}
 {{- end -}}
 
-{{- define "spire-server.bundle-namespace-bundlepublisher" -}}
-  {{- if .Values.bundlePublisher.k8sConfigMap.namespace }}
-    {{- .Values.bundlePublisher.k8sConfigMap.namespace }}
-  {{- else if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else if and (dig "spire" "recommendations" "enabled" false .Values.global) (dig "spire" "recommendations" "namespaceLayout" true .Values.global) }}
-    {{- if ne (len (dig "spire" "namespaces" "system" "name" "" .Values.global)) 0 }}
-      {{- .Values.global.spire.namespaces.system.name }}
-    {{- else }}
-      {{- printf "spire-system" }}
-    {{- end }}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "spire-server.bundle-namespace-notifier" -}}
-  {{- if .Values.notifier.k8sBundle.namespace }}
-    {{- .Values.notifier.k8sBundle.namespace }}
-  {{- else if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else if and (dig "spire" "recommendations" "enabled" false .Values.global) (dig "spire" "recommendations" "namespaceLayout" true .Values.global) }}
-    {{- if ne (len (dig "spire" "namespaces" "system" "name" "" .Values.global)) 0 }}
-      {{- .Values.global.spire.namespaces.system.name }}
-    {{- else }}
-      {{- printf "spire-system" }}
-    {{- end }}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
 {{- define "spire-server.bundle-namespace" -}}
   {{- if .Values.notifier.k8sBundle.namespace }}
     {{- .Values.notifier.k8sBundle.namespace }}
-  {{- else }}
-    {{- include "spire-server.bundle-namespace-bundlepublisher" . -}}
-  {{- end }}
-{{- end }}
+  {{- else if .Values.namespaceOverride -}}
+    {{- .Values.namespaceOverride -}}
+  {{- else if and (dig "spire" "recommendations" "enabled" false .Values.global) (dig "spire" "recommendations" "namespaceLayout" true .Values.global) }}
+    {{- if ne (len (dig "spire" "namespaces" "system" "name" "" .Values.global)) 0 }}
+      {{- .Values.global.spire.namespaces.system.name }}
+    {{- else }}
+      {{- printf "spire-system" }}
+    {{- end }}
+  {{- else -}}
+    {{- .Release.Namespace -}}
+  {{- end -}}
+{{- end -}}
 
 {{- define "spire-server.podMonitor.namespace" -}}
   {{- if ne (len .Values.telemetry.prometheus.podMonitor.namespace) 0 }}
@@ -185,20 +161,6 @@ Create the name of the service account to use
 {{- end }}
 {{- end }}
 
-{{- define "spire-server.config-sqlite-query" }}
-{{- $lst := list }}
-{{- range . }}
-{{- range $key, $value := . }}
-{{- $eValue := toString $value }}
-{{- $entry := printf "%s=%s" (urlquery $key) (urlquery $eValue) }}
-{{- $lst = append $lst $entry }}
-{{- end }}
-{{- end }}
-{{- if gt (len $lst) 0 }}
-{{- printf "?%s" (join "&" (uniq $lst)) }}
-{{- end }}
-{{- end }}
-
 {{- define "spire-server.config-mysql-query" }}
 {{- $lst := list }}
 {{- range . }}
@@ -232,8 +194,7 @@ Create the name of the service account to use
 {{- $ropw := "" }}
 {{- if eq .Values.dataStore.sql.databaseType "sqlite3" }}
   {{- $_ := set $config "database_type" "sqlite3" }}
-  {{- $query := include "spire-server.config-sqlite-query" .Values.dataStore.sql.options }}
-  {{- $_ := set $config "connection_string" (printf "%s%s" .Values.dataStore.sql.file $query) }}
+  {{- $_ := set $config "connection_string" "/run/spire/data/datastore.sqlite3" }}
 {{- else if or (eq .Values.dataStore.sql.databaseType "mysql") (eq .Values.dataStore.sql.databaseType "aws_mysql") }}
   {{- if eq .Values.dataStore.sql.databaseType "mysql" }}
   {{-   $_ := set $config "database_type" "mysql" }}
@@ -264,7 +225,7 @@ Create the name of the service account to use
   {{- if .Values.dataStore.sql.readOnly.enabled }}
   {{-   $roPort := int .Values.dataStore.sql.readOnly.port | default 5432 }}
   {{-   $roOptions:= include "spire-server.config-postgresql-options" .Values.dataStore.sql.readOnly.options }}
-  {{-   $_ := set $config "ro_connection_string" (printf "dbname=%s user=%s%s host=%s port=%d%s" .Values.dataStore.sql.readOnly.databaseName .Values.dataStore.sql.readOnly.username $ropw .Values.dataStore.sql.readOnly.host $roPort $roOptions) }}
+  {{-   $_ := set $config "ro_connection_string" (printf "dbname=%s user=%s%s host=%s port=%d%s" .Values.dataStore.sql.readOnly.databaseName $ropw .Values.dataStore.sql.readOnly.username .Values.dataStore.sql.readOnly.host $roPort $roOptions) }}
   {{- end }}
 {{- else }}
   {{- fail "Unsupported database type" }}

charts/spire/charts/spire-server/templates/bundle-configmap.yaml

@@ -1,7 +1,3 @@
-{{- if and .Values.notifier.k8sBundle.enabled .Values.bundlePublisher.k8sConfigMap.enabled }}
-{{- fail "You can only enable either notifier.k8sBundle or bundlePublisher.k8sConfigMap." }}
-{{- end }}
-{{- if .Values.notifier.k8sBundle.enabled }}
 {{- $namespace := include "spire-server.bundle-namespace" . }}
 apiVersion: v1
 kind: ConfigMap
@@ -12,4 +8,3 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-{{- end }}

charts/spire/charts/spire-server/templates/configmap.yaml

@@ -58,9 +58,6 @@ server:
   ca_key_type: {{ .Values.caKeyType | quote }}
   ca_ttl: {{ .Values.caTTL | quote }}
 
-  {{- if .Values.agentTTL }}
-  agent_ttl: {{ .Values.agentTTL | quote }}
-  {{- end }}
   default_x509_svid_ttl: {{ .Values.defaultX509SvidTTL | quote }}
   default_jwt_svid_ttl: {{ .Values.defaultJwtSvidTTL | quote }}
 
@@ -105,21 +102,9 @@ server:
   {{- end }}
 
 plugins:
-  {{- if or .Values.credentialComposer.uniqueID.enabled .Values.credentialComposer.cel.enabled }}
+  {{- if .Values.credentialComposer.uniqueID.enabled }}
   CredentialComposer:
-    {{- if or .Values.credentialComposer.uniqueID.enabled }}
     uniqueid: {}
-    {{- end }}
-    {{- with .Values.credentialComposer.cel }}
-    {{- if .enabled }}
-    cel:
-      plugin_cmd: "/cel/credentialcomposer-cel"
-      plugin_checksum: {{ .checksum }}
-      plugin_data:
-        jwt:
-          expression_string: {{ .jwt.expression | quote }}
-    {{- end }}
-    {{- end }}
   {{- end }}
 
   DataStore:
@@ -142,7 +127,7 @@ plugins:
         {{- end }}
         disable_migration: {{ .Values.dataStore.sql.disableMigration }}
 
-  {{- if or .Values.nodeAttestor.k8sPSAT.enabled .Values.nodeAttestor.externalK8sPSAT.enabled .Values.nodeAttestor.joinToken.enabled .Values.nodeAttestor.httpChallenge.enabled .Values.nodeAttestor.tpmDirect.enabled .Values.nodeAttestor.awsIID.enabled }}
+  {{- if or .Values.nodeAttestor.k8sPSAT.enabled .Values.nodeAttestor.externalK8sPSAT.enabled .Values.nodeAttestor.joinToken.enabled .Values.nodeAttestor.httpChallenge.enabled .Values.nodeAttestor.tpmDirect.enabled }}
   NodeAttestor:
   {{- $clusters := default .Values.kubeConfigs .Values.nodeAttestor.externalK8sPSAT.clusters }}
   {{- if or (eq (.Values.nodeAttestor.k8sPSAT.enabled | toString) "true") (and (eq (.Values.nodeAttestor.externalK8sPSAT.enabled | toString) "true") (gt (len $clusters) 0)) }}
@@ -222,15 +207,6 @@ plugins:
         {{- end }}
   {{- end }}
   {{- end }}
-  {{- with .Values.nodeAttestor.awsIID }}
-  {{- if eq (.enabled | toString) "true" }}
-    aws_iid:
-      plugin_data:
-        {{- if ne .assumeRole "" }}
-        assume_role: {{ .assumeRole | quote }}
-        {{- end }}
-  {{- end }}
-  {{- end }}
   {{- end }}
 
   {{- with .Values.keyManager.disk }}
@@ -286,14 +262,8 @@ plugins:
     k8sbundle:
       plugin_data:
         {{- if eq (.Values.notifier.k8sBundle.enabled | toString) "true" }}
-        namespace: {{ include "spire-server.bundle-namespace-notifier" . | quote }}
+        namespace: {{ include "spire-server.bundle-namespace" . | quote }}
         config_map: {{ include "spire-lib.bundle-configmap" . | quote }}
-        {{- with .Values.notifier.k8sBundle.apiServiceLabel }}
-        api_service_label: {{ . | quote }}
-        {{- end }}
-        {{- with .Values.notifier.k8sBundle.webhookLabel }}
-        webhook_label: {{ . | quote }}
-        {{- end }}
         {{- end }}
         {{- if and (eq (.Values.notifier.externalK8sBundle.enabled | toString) "true") (ne (len $externalK8sBundleClusters) 0) }}
         clusters:
@@ -316,51 +286,8 @@ plugins:
         {{- end }}
   {{- end }}
 
-  {{- $externalK8sConfigMapClusters := default .Values.kubeConfigs .Values.bundlePublisher.externalK8sConfigMap.clusters }}
-  {{- if or .Values.bundlePublisher.awsRolesAnywhereTrustAnchor.enabled .Values.bundlePublisher.awsS3.enabled .Values.bundlePublisher.gcpCloudStorage.enabled .Values.bundlePublisher.k8sConfigMap.enabled (and .Values.bundlePublisher.externalK8sConfigMap.enabled (ne (len $externalK8sConfigMapClusters) 0)) }}
+  {{- if or .Values.bundlePublisher.awsRolesAnywhereTrustAnchor.enabled .Values.bundlePublisher.awsS3.enabled .Values.bundlePublisher.gcpCloudStorage.enabled }}
   BundlePublisher:
-    {{- if or .Values.bundlePublisher.k8sConfigMap.enabled (and .Values.bundlePublisher.externalK8sConfigMap.enabled (ne (len $externalK8sConfigMapClusters) 0)) }}
-    k8s_configmap:
-      plugin_data:
-        clusters:
-          {{- $prefix := "-" }}
-          {{- if eq (.Values.bundlePublisher.k8sConfigMap.enabled | toString) "true" }}
-          {{ $prefix }} chart-internal:
-              format: {{ .Values.bundlePublisher.k8sConfigMap.format | quote }}
-              namespace: {{ include "spire-server.bundle-namespace-bundlepublisher" . | quote }}
-              configmap_name: {{ include "spire-lib.bundle-configmap" . | quote }}
-              configmap_key: {{ printf "bundle.%s" (include "spire-lib.trust-bundle-ext" (dict "trustBundleFormat" .Values.bundlePublisher.k8sConfigMap.format)) | quote }}
-          {{- $prefix := " " }}
-          {{- end }}
-          {{- if and (eq (.Values.bundlePublisher.externalK8sConfigMap.enabled | toString) "true") (ne (len $externalK8sConfigMapClusters) 0) }}
-          {{- $clusterDefaults := .Values.bundlePublisher.externalK8sConfigMap.defaults }}
-          {{- range $name, $_ := $externalK8sConfigMapClusters }}
-          {{ $prefix }} {{ $name | quote }}:
-              {{- $clusterSettings := dict }}
-              {{- if hasKey $root.Values.bundlePublisher.externalK8sConfigMap.clusters $name }}
-              {{- $clusterSettings = index $root.Values.bundlePublisher.externalK8sConfigMap.clusters $name }}
-              {{- end }}
-              {{- if hasKey $clusterSettings "kubeConfigName" }}
-              kubeconfig_path: /kubeconfigs/{{ $clusterSettings.kubeConfigName }}
-              {{- else }}
-              kubeconfig_path: /kubeconfigs/{{ $name }}
-              {{- end }}
-              {{- $format := $clusterDefaults.format }}
-              {{- if hasKey $clusterSettings "format" }}{{- $format = $clusterSettings.format }}{{- end }}
-              format: {{ $format | quote }}
-              namespace: {{ if hasKey $clusterSettings "namespace" }}{{ $clusterSettings.namespace }}{{ else }}{{ $clusterDefaults.namespace }}{{ end }}
-              configmap_name: {{ if hasKey $clusterSettings "configMapName" }}{{ $clusterSettings.configMapName }}{{ else }}{{ $clusterDefaults.configMapName }}{{ end }}
-              {{- if hasKey $clusterSettings "configMapKey" }}
-              configmap_key: {{ $clusterSettings.configMapKey | quote }}
-              {{- else if ne $clusterDefaults.configMapKey "" }}
-              configmap_key: {{ $clusterDefaults.configMapKey | quote }}
-              {{- else }}
-              configmap_key: {{ printf "bundle.%s" (include "spire-lib.trust-bundle-ext" (dict "trustBundleFormat" $format)) | quote }}
-              {{- end }}
-              {{- $prefix := " " }}
-          {{- end }}
-        {{- end }}
-    {{- end }}
     {{- if .Values.bundlePublisher.awsRolesAnywhereTrustAnchor.enabled }}
     aws_rolesanywhere_trustanchor:
       plugin_data:
@@ -370,7 +297,6 @@ plugins:
     {{- if .Values.bundlePublisher.awsS3.enabled }}
     aws_s3:
       plugin_data:
-        endpoint: {{ .Values.bundlePublisher.awsS3.endpoint | quote }}
         region: {{ .Values.bundlePublisher.awsS3.region | quote }}
         bucket: {{ .Values.bundlePublisher.awsS3.bucket | quote }}
         object_key: {{ .Values.bundlePublisher.awsS3.objectKey | quote }}
@@ -381,7 +307,7 @@ plugins:
       plugin_data:
         bucket_name: {{ .Values.bundlePublisher.gcpCloudStorage.bucketName | quote }}
         object_name: {{ .Values.bundlePublisher.gcpCloudStorage.objectName | quote }}
-        format: {{ .Values.bundlePublisher.gcpCloudStorage.format | quote }}
+        format: {{ .Values.bundlePublisher.awsS3.format | quote }}
     {{- end }}
   {{- end }}
 
@@ -499,13 +425,6 @@ telemetry:
       - host: "0.0.0.0"
         port: 9988
 {{- end }}
-
-{{- if .Values.telemetry.datadog.enabled }}
-telemetry:
-  - DogStatsd:
-      - address: "{{ .Values.telemetry.datadog.address }}:{{ .Values.telemetry.datadog.port }}"
-{{- end }}
-
 {{- end }}
 {{- if not .Values.externalServer }}
 apiVersion: v1

charts/spire/charts/spire-server/templates/controller-manager-cluster-ids.yaml

@@ -17,21 +17,6 @@ matchLabels:
   release: {{ .Release.Name }}
   release-namespace: {{ .Release.Namespace }}
   component: oidc-discovery-provider
-{{-   else if eq .type "spike-keeper" }}
-matchLabels:
-  release: {{ .Release.Name }}
-  release-namespace: {{ .Release.Namespace }}
-  component: spike-keeper
-{{-   else if eq .type "spike-nexus" }}
-matchLabels:
-  release: {{ .Release.Name }}
-  release-namespace: {{ .Release.Namespace }}
-  component: spike-nexus
-{{-   else if eq .type "spike-pilot" }}
-matchLabels:
-  release: {{ .Release.Name }}
-  release-namespace: {{ .Release.Namespace }}
-  component: spike-pilot
 {{-   else if eq .type "test-keys" }}
 matchLabels:
   release: {{ .Release.Name }}
@@ -41,7 +26,6 @@ matchLabels:
 {}
 {{-   end }}
 {{- end }}
-{{- if eq .Values.controllerManager.staticManifestMode "off" }}
 {{- $root := . }}
 {{  $namespaces := list .Release.Namespace .Values.namespaceOverride (dig "spire" "namespaces" "server" "name" "" .Values.global) (dig "spire" "namespaces" "system" "name" "" .Values.global) | compact | uniq }}
 {{- range $key, $value := .Values.controllerManager.identities.clusterSPIFFEIDs }}
@@ -53,8 +37,8 @@ matchLabels:
 {{-   if eq ($root.Values.controllerManager.enabled | toString) "true" }}
 {{-     if or (not (hasKey $value "enabled")) (eq ($value.enabled | toString) "true") }}
 {{-       $type := dig "type" "base" $value }}
-{{-       if not (has $type (list "base" "raw" "child-servers" "oidc-discovery-provider" "spike-keeper" "spike-nexus" "spike-pilot" "test-keys")) }}
-{{-         fail (printf "Type given: %s, must be one of [base, raw, child-servers, oidc-discovery-provider, spike-keeper, spike-nexus, spike-pilot, test-keys]" $type) }}
+{{-       if not (has $type (list "base" "raw" "child-servers" "oidc-discovery-provider" "test-keys")) }}
+{{-         fail (printf "Type given: %s, must be one of [base, raw, child-servers, oidc-discovery-provider, test-keys]" $type) }}
 {{-       end }}
 {{-       $namespaceSelector := deepCopy (dig "namespaceSelector" (dict) $value) }}
 {{-       if ne $type "raw" }}
@@ -132,4 +116,3 @@ spec:
 {{-     end }}
 {{-   end }}
 {{- end }}
-{{- end }}

charts/spire/charts/spire-server/templates/controller-manager-configmap.yaml

@@ -47,12 +47,10 @@ metrics:
   bindAddress: 0.0.0.0:{{ $promPort }}
 health:
   healthProbeBindAddress: 0.0.0.0:{{ $healthPort }}
-{{- if eq .Values.controllerManager.staticManifestMode "off" }}
 leaderElection:
   leaderElect: true
   resourceName: {{ printf "%s-%s%s" .Release.Namespace (default .Release.Name .Values.crNameOverride) .suffix | sha256sum | trunc 8 }}.spiffe.io
   resourceNamespace: {{ include "spire-server.namespace" . }}
-{{- end }}
 {{- with .settings.cacheNamespaces }}
 cacheNamespaces:
   {{- toYaml . | nindent 2 }}
@@ -87,12 +85,7 @@ parentIDTemplate: {{ if hasKey .settings "parentIDTemplate" }}{{ .settings.paren
 {{-   $reconcile = .settings.reconcile }}
 {{- end }}
 reconcile:
-  {{- if eq .Values.controllerManager.staticManifestMode "off" }}
   clusterSPIFFEIDs: {{ if hasKey $reconcile "clusterSPIFFEIDs" }}{{ toYaml $reconcile.clusterSPIFFEIDs }}{{ else }}{{ toYaml .defaults.reconcile.clusterSPIFFEIDs }}{{ end }}
-  {{- end }}
   clusterStaticEntries: {{ if hasKey $reconcile "clusterStaticEntries" }}{{ toYaml $reconcile.clusterStaticEntries }}{{ else }}{{ toYaml .defaults.reconcile.clusterStaticEntries }}{{ end }}
   clusterFederatedTrustDomains: {{ if hasKey $reconcile "clusterFederatedTrustDomains" }}{{ toYaml $reconcile.clusterFederatedTrustDomains }}{{ else }}{{ toYaml .defaults.reconcile.clusterFederatedTrustDomains }}{{ end }}
-{{- if ne .Values.controllerManager.staticManifestMode "off" }}
-staticManifestPath: /manifests
-{{- end }}
 {{- end }}

charts/spire/charts/spire-server/templates/controller-manager-ftd.yaml

@@ -1,7 +1,5 @@
-{{- define "spire-server.cluster-federated-trust-domains" -}}
-{{- $root := .root }}
-{{- $useShortName := .useShortName }}
-{{- range $key, $value := $root.Values.controllerManager.identities.clusterFederatedTrustDomains }}
+{{- $root := . }}
+{{- range $key, $value := .Values.controllerManager.identities.clusterFederatedTrustDomains }}
 {{-   range $skey, $svalue := $value }}
 {{-     if not (has $skey (list "name" "annotations" "labels" "enabled" "bundleEndpointProfile" "bundleEndpointURL" "trustDomain" "trustDomainBundle")) }}
 {{-       fail (printf "Unsupported property specified: %s" $skey) }}
@@ -14,45 +12,34 @@
 {{-   end }}
 {{-   if eq ($root.Values.controllerManager.enabled | toString) "true" }}
 {{-     if or (not (hasKey $value "enabled")) (eq ($value.enabled | toString) "true") }}
-- apiVersion: spire.spiffe.io/v1alpha1
-  kind: ClusterFederatedTrustDomain
-  metadata:
-    {{- if $useShortName }}
-    name: {{ $key }}
-    {{- else }}
-    name: {{ $root.Release.Namespace }}-{{ default $root.Release.Name $root.Values.crNameOverride }}-{{ $key }}
-    {{- end }}
-    {{- with $value.annotations }}
-    annotations:
-      {{- toYaml . | nindent 6 }}
-    {{- end }}
-    {{- with $value.labels }}
-    labels:
-      {{- toYaml . | nindent 6 }}
-    {{- end }}
-  spec:
-    className: {{ include "spire-server.controller-manager-class-name" $root | quote }}
-    {{- with $value.bundleEndpointProfile }}
-    bundleEndpointProfile:
-      {{- toYaml . | nindent 6 }}
-    {{- end }}
-    {{- with $value.bundleEndpointURL }}
-    bundleEndpointURL: {{ . | quote }}
-    {{- end }}
-    {{- with $value.trustDomain }}
-    trustDomain: {{ . | quote }}
-    {{- end }}
-    {{- with $value.trustDomainBundle }}
-    trustDomainBundle: {{ . | quote }}
-    {{- end }}
+---
+apiVersion: spire.spiffe.io/v1alpha1
+kind: ClusterFederatedTrustDomain
+metadata:
+  name: {{ $root.Release.Namespace }}-{{ default $root.Release.Name $root.Values.crNameOverride }}-{{ $key }}
+  {{- with $value.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with $value.labels }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  className: {{ include "spire-server.controller-manager-class-name" $root | quote }}
+  {{- with $value.bundleEndpointProfile }}
+  bundleEndpointProfile:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with $value.bundleEndpointURL }}
+  bundleEndpointURL: {{ . | quote }}
+  {{- end }}
+  {{- with $value.trustDomain }}
+  trustDomain: {{ . | quote }}
+  {{- end }}
+  {{- with $value.trustDomainBundle }}
+  trustDomainBundle: {{ . | quote }}
+  {{- end }}
 {{-     end }}
 {{-   end }}
 {{- end }}
-{{- end }}
-{{- if eq .Values.controllerManager.staticManifestMode "off" }}
-{{-   $t := include "spire-server.cluster-federated-trust-domains" (dict "root" . "useShortName" false) | fromYamlArray }}
-{{-   range $_, $v := $t }}
----
-{{- $v | toYaml }}
-{{-   end }}
-{{- end }}

charts/spire/charts/spire-server/templates/controller-manager-roles.yaml

@@ -1,4 +1,4 @@
-{{- if and (eq (.Values.controllerManager.enabled | toString) "true") (eq .Values.controllerManager.staticManifestMode "off") }}
+{{- if eq (.Values.controllerManager.enabled | toString) "true" }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:

charts/spire/charts/spire-server/templates/controller-manager-service.yaml

@@ -1,5 +1,4 @@
 {{- if not .Values.externalServer }}
-{{- if eq .Values.controllerManager.staticManifestMode "off" }}
 {{- if eq (.Values.controllerManager.enabled | toString) "true" }}
 apiVersion: v1
 kind: Service
@@ -23,4 +22,3 @@ spec:
     {{- include "spire-server.selectorLabels" . | nindent 4 }}
 {{- end }}
 {{- end }}
-{{- end }}

charts/spire/charts/spire-server/templates/controller-manager-static-configmap.yaml

@@ -1,21 +0,0 @@
-{{- if not (has .Values.controllerManager.staticManifestMode (list "off" "internal" "external" )) }}
-{{-   fail "Unsupported option specified for controllerManager.staticManifestMode" }}
-{{- end }}
-{{- if eq .Values.controllerManager.staticManifestMode "internal" }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "spire-controller-manager.fullname" . }}-static
-  namespace: {{ include "spire-server.namespace" . }}
-data:
-  {{- $t := include "spire-server.cluster-static-entries" (dict "root" . "useShortName" true) | fromYamlArray }}
-  {{- range $_, $v := $t }}
-  "e-{{ $v.metadata.name }}.yaml": |
-    {{- $v | toYaml | nindent 4 }}
-  {{- end }}
-  {{- $t := include "spire-server.cluster-federated-trust-domains" (dict "root" . "useShortName" true) | fromYamlArray }}
-  {{- range $_, $v := $t }}
-  "f-{{ $v.metadata.name }}.yaml": |
-    {{- $v | toYaml | nindent 4 }}
-  {{- end }}
-{{- end }}

charts/spire/charts/spire-server/templates/controller-manager-static-entries.yaml

@@ -1,7 +1,5 @@
-{{- define "spire-server.cluster-static-entries" -}}
-{{- $root := .root }}
-{{- $useShortName := .useShortName }}
-{{- range $key, $value := $root.Values.controllerManager.identities.clusterStaticEntries }}
+{{- $root := . }}
+{{- range $key, $value := .Values.controllerManager.identities.clusterStaticEntries }}
 {{-   range $skey, $svalue := $value }}
 {{-     if not (has $skey (list "name" "annotations" "labels" "enabled" "admin" "dnsNames" "downstream" "federatesWith" "hint" "jwtSVIDTTL" "parentID" "selectors" "spiffeID" "x509SVIDTTL")) }}
 {{-       fail (printf "Unsupported property specified: %s" $skey) }}
@@ -14,63 +12,52 @@
 {{-   end }}
 {{-   if eq ($root.Values.controllerManager.enabled | toString) "true" }}
 {{-     if or (not (hasKey $value "enabled")) (eq ($value.enabled | toString) "true") }}
-- apiVersion: spire.spiffe.io/v1alpha1
-  kind: ClusterStaticEntry
-  metadata:
-    {{- if $useShortName }}
-    name: {{ $key }}
-    {{- else }}
-    name: {{ $root.Release.Namespace }}-{{ default $root.Release.Name $root.Values.crNameOverride }}-{{ $key }}
-    {{- end }}
-    {{- with $value.annotations }}
-    annotations:
-      {{- toYaml . | nindent 6 }}
-    {{- end }}
-    {{- with $value.labels }}
-    labels:
-      {{- toYaml . | nindent 6 }}
-    {{- end }}
-  spec:
-    className: {{ include "spire-server.controller-manager-class-name" $root | quote }}
-    spiffeID: {{ $value.spiffeID | quote }}
-    {{- with $value.federatesWith }}
-    federatesWith:
-    {{- toYaml . | nindent 6 }}
-    {{- end }}
-    {{- with $value.selectors }}
-    selectors:
-      {{- toYaml . | nindent 6 }}
-    {{- end }}
-    {{- with $value.parentID }}
-    parentID: {{ . | quote }}
-    {{- end }}
-    {{- with $value.dnsNames }}
-    dnsNames:
-      {{- toYaml . | nindent 6 }}
-    {{- end }}
-    {{- with $value.hint }}
-    hint: {{ . | quote }}
-    {{- end }}
-    {{- with $value.x509SVIDTTL }}
-    x509SVIDTTL: {{ . | quote }}
-    {{- end }}
-    {{- with $value.jwtSVIDTTL }}
-    jwtSVIDTTL: {{ . | quote }}
-    {{- end }}
-    {{- with $value.admin }}
-    admin: {{ . }}
-    {{- end }}
-    {{- with $value.downstream }}
-    downstream: {{ . }}
-    {{- end }}
+---
+apiVersion: spire.spiffe.io/v1alpha1
+kind: ClusterStaticEntry
+metadata:
+  name: {{ $root.Release.Namespace }}-{{ default $root.Release.Name $root.Values.crNameOverride }}-{{ $key }}
+  {{- with $value.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with $value.labels }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  className: {{ include "spire-server.controller-manager-class-name" $root | quote }}
+  spiffeID: {{ $value.spiffeID | quote }}
+  {{- with $value.federatesWith }}
+  federatesWith:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with $value.selectors }}
+  selectors:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with $value.parentID }}
+  parentID: {{ . | quote }}
+  {{- end }}
+  {{- with $value.dnsNames }}
+  dnsNames:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with $value.hint }}
+  hint: {{ . | quote }}
+  {{- end }}
+  {{- with $value.x509SVIDTTL }}
+  x509SVIDTTL: {{ . | quote }}
+  {{- end }}
+  {{- with $value.jwtSVIDTTL }}
+  jwtSVIDTTL: {{ . | quote }}
+  {{- end }}
+  {{- with $value.admin }}
+  admin: {{ . }}
+  {{- end }}
+  {{- with $value.downstream }}
+  downstream: {{ . }}
+  {{- end }}
 {{-     end }}
 {{-   end }}
 {{- end }}
-{{- end }}
-{{- if eq .Values.controllerManager.staticManifestMode "off" }}
-{{-   $t := include "spire-server.cluster-static-entries" (dict "root" . "useShortName" false) | fromYamlArray }}
-{{-   range $_, $v := $t }}
----
-{{- $v | toYaml }}
-{{-   end }}
-{{- end }}

charts/spire/charts/spire-server/templates/controller-manager-webhook.yaml

@@ -1,5 +1,4 @@
 {{- if not .Values.externalServer }}
-{{- if eq .Values.controllerManager.staticManifestMode "off" }}
 {{- if and (eq (.Values.controllerManager.enabled | toString) "true") .Values.controllerManager.validatingWebhookConfiguration.enabled }}
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
@@ -40,4 +39,3 @@ webhooks:
     sideEffects: None
 {{- end }}
 {{- end }}
-{{- end }}

charts/spire/charts/spire-server/templates/post-install-hook.yaml

@@ -1,6 +1,5 @@
 {{- if not .Values.externalServer }}
 {{- if eq ((dig "installAndUpgradeHooks" "enabled" .Values.controllerManager.installAndUpgradeHook.enabled .Values.global) | toString) "true" }}
-{{- if eq .Values.controllerManager.staticManifestMode "off" }}
 {{- if and (eq (.Values.controllerManager.enabled | toString) "true") .Values.controllerManager.validatingWebhookConfiguration.enabled }}
 {{- if eq .Values.controllerManager.validatingWebhookConfiguration.failurePolicy "Fail" }}
 apiVersion: v1
@@ -94,4 +93,3 @@ spec:
 {{- end }}
 {{- end }}
 {{- end }}
-{{- end }}

charts/spire/charts/spire-server/templates/post-upgrade-hook.yaml

@@ -1,6 +1,5 @@
 {{- if not .Values.externalServer }}
 {{- if eq ((dig "installAndUpgradeHooks" "enabled" .Values.controllerManager.installAndUpgradeHook.enabled .Values.global) | toString) "true" }}
-{{- if eq .Values.controllerManager.staticManifestMode "off" }}
 {{- if and (eq (.Values.controllerManager.enabled | toString) "true") .Values.controllerManager.validatingWebhookConfiguration.enabled }}
 {{- if eq .Values.controllerManager.validatingWebhookConfiguration.failurePolicy "Fail" }}
 apiVersion: v1
@@ -94,4 +93,3 @@ spec:
 {{- end }}
 {{- end }}
 {{- end }}
-{{- end }}

charts/spire/charts/spire-server/templates/pre-upgrade-hook.yaml

@@ -1,6 +1,5 @@
 {{- if not .Values.externalServer }}
 {{- if eq ((dig "installAndUpgradeHooks" "enabled" .Values.controllerManager.installAndUpgradeHook.enabled .Values.global) | toString) "true" }}
-{{- if eq .Values.controllerManager.staticManifestMode "off" }}
 {{- if and (eq (.Values.controllerManager.enabled | toString) "true") .Values.controllerManager.validatingWebhookConfiguration.enabled }}
 {{- if eq .Values.controllerManager.validatingWebhookConfiguration.failurePolicy "Fail" }}
 apiVersion: v1
@@ -94,4 +93,3 @@ spec:
 {{- end }}
 {{- end }}
 {{- end }}
-{{- end }}

charts/spire/charts/spire-server/templates/roles.yaml

@@ -1,7 +1,7 @@
 {{- $subject := include "spire-server.subject" . }}
 {{- $namespace := include "spire-server.namespace" . }}
 {{- $bundleNamespace := include "spire-server.bundle-namespace" . }}
-{{- if or .Values.notifier.k8sBundle.enabled .Values.bundlePublisher.k8sConfigMap.enabled }}
+{{- if .Values.notifier.k8sBundle.enabled }}
 # Role to be able to push certificate bundles to a configmap
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
@@ -15,9 +15,6 @@ rules:
     verbs:
       - get
       - patch
-{{- if .Values.bundlePublisher.k8sConfigMap.enabled }}
-      - create
-{{- end }}
 {{- end }}
 {{- if and .Values.upstreamAuthority.certManager.enabled .Values.upstreamAuthority.certManager.rbac.create }}
 ---
@@ -51,7 +48,7 @@ roleRef:
   name: {{ include "spire-server.fullname" . }}-cm
   apiGroup: rbac.authorization.k8s.io
 {{- end }}
-{{- if or .Values.notifier.k8sBundle.enabled .Values.bundlePublisher.k8sConfigMap.enabled }}
+{{- if .Values.notifier.k8sBundle.enabled }}
 ---
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1

charts/spire/charts/spire-server/templates/server-resource.yaml

@@ -121,41 +121,8 @@ spec:
       securityContext:
         {{- $podSecurityContext | toYaml | nindent 8 }}
       {{- include "spire-lib.default_cluster_priority_class_name" . | nindent 6 }}
-      {{- if or (gt (len .Values.initContainers) 0) (and .Values.upstreamAuthority.certManager.enabled .Values.upstreamAuthority.certManager.ca.create) .Values.nodeAttestor.tpmDirect.enabled .Values.credentialComposer.cel.enabled $needsChown }}
+      {{- if or (gt (len .Values.initContainers) 0) (and .Values.upstreamAuthority.certManager.enabled .Values.upstreamAuthority.certManager.ca.create) .Values.nodeAttestor.tpmDirect.enabled $needsChown }}
       initContainers:
-        {{- if .Values.credentialComposer.cel.enabled }}
-        - name: init-cel
-          securityContext:
-            {{- include "spire-lib.securitycontext" . | nindent 12 }}
-          image: {{ template "spire-lib.image" (dict "appVersion" $.Chart.AppVersion "image" .Values.tools.busybox.image "global" .Values.global) }}
-          # SPIRE must be able to fork the plugin directly within its container. First copy a busybox so that the plugin can be copied into the right place.
-          command:
-            - busybox
-            - sh
-            - -ec
-            - |
-              cp -a /bin/busybox /cel/busybox
-          volumeMounts:
-            - name: cel
-              mountPath: /cel
-          imagePullPolicy: {{ .Values.credentialComposer.cel.image.pullPolicy }}
-        - name: init-cel2
-          securityContext:
-            {{- include "spire-lib.securitycontext" . | nindent 12 }}
-          image: {{ template "spire-lib.image" (dict "appVersion" $.Chart.AppVersion "image" .Values.credentialComposer.cel.image "global" .Values.global) }}
-          # Second, use the previously copied busybox to copy the plugin into a volume that can be mounted where SPIRE can execute it.
-          command:
-            - /cel/busybox
-            - sh
-            - -ec
-            - |
-              /cel/busybox cp -a {{ .Values.credentialComposer.cel.pluginPath }} /cel/credentialcomposer-cel
-              /cel/busybox rm -f /cel/busybox
-          volumeMounts:
-            - name: cel
-              mountPath: /cel
-          imagePullPolicy: {{ .Values.credentialComposer.cel.image.pullPolicy }}
-        {{- end }}
         {{- if .Values.nodeAttestor.tpmDirect.enabled }}
         - name: init-tpm-direct
           securityContext:
@@ -180,7 +147,7 @@ spec:
         - name: chown
           image: {{ template "spire-lib.image" (dict "image" .Values.chown.image "global" .Values.global) }}
           imagePullPolicy: {{ .Values.chown.image.pullPolicy }}
-          command: ["sh", "-c"]
+          command: ["bash", "-c"]
           args:
             - |
               chown -R {{ $podSecurityContext.runAsUser }}:{{ $podSecurityContext.runAsGroup }} /var/lib/spire
@@ -335,11 +302,6 @@ spec:
               mountPath: /kubeconfigs
               readOnly: true
             {{- end }}
-            {{- if .Values.credentialComposer.cel.enabled }}
-            - name: cel
-              mountPath: /cel
-              readOnly: true
-            {{- end }}
             {{- if .Values.nodeAttestor.tpmDirect.enabled }}
             - name: tpm-direct
               mountPath: /tpm
@@ -478,10 +440,6 @@ spec:
           secret:
             secretName: {{ include "spire-server.fullname" . }}-kubeconfigs
         {{- end }}
-        {{- if .Values.credentialComposer.cel.enabled }}
-        - name: cel
-          emptyDir: {}
-        {{- end }}
         {{- if .Values.nodeAttestor.tpmDirect.enabled }}
         - name: tpm-direct
           emptyDir: {}
@@ -547,11 +505,6 @@ spec:
         {{- end }}
         {{- end }}
         {{- if eq (.Values.controllerManager.enabled | toString) "true" }}
-        {{- if ne .Values.controllerManager.staticManifestMode "off" }}
-        - name: controller-manager-static-config
-          configMap:
-            name: {{ include "spire-controller-manager.fullname" . }}-static
-        {{- end }}
         - name: controller-manager-config
           configMap:
             name: {{ include "spire-controller-manager.fullname" . }}

charts/spire/charts/spire-server/templates/tests/test-tornjak-connection.yaml

@@ -17,13 +17,13 @@ spec:
     - name: curl-tornjak-backend
       image: {{ template "spire-lib.image" (dict "image" .Values.tests.bash.image "global" .Values.global) }}
       command: ['curl']
-      args: ['-k', '-s', '-f', 'http://{{ include "spire-tornjak.servicename" . }}.{{ include "spire-server.namespace" . }}.svc.{{ include "spire-lib.cluster-domain" . }}:{{ .Values.tornjak.service.ports.http }}/api/v1/tornjak/serverinfo']
+      args: ['-k', '-s', '-f', 'http://{{ include "spire-tornjak.servicename" . }}.{{ include "spire-server.namespace" . }}.svc.{{ include "spire-lib.cluster-domain" . }}:{{ .Values.tornjak.service.ports.http }}/api/tornjak/serverinfo']
       securityContext:
         {{- include "spire-lib.securitycontext" . | nindent 8 }}
     - name: curl-tornjak-backend-and-spire
       image: {{ template "spire-lib.image" (dict "image" .Values.tests.bash.image "global" .Values.global) }}
       command: ['curl']
-      args: ['-k', '-s', '-f', 'http://{{ include "spire-tornjak.servicename" . }}.{{ include "spire-server.namespace" . }}.svc.{{ include "spire-lib.cluster-domain" . }}:{{ .Values.tornjak.service.ports.http }}/api/v1/spire/healthcheck']
+      args: ['-k', '-s', '-f', 'http://{{ include "spire-tornjak.servicename" . }}.{{ include "spire-server.namespace" . }}.svc.{{ include "spire-lib.cluster-domain" . }}:{{ .Values.tornjak.service.ports.http }}/api/healthcheck']
       securityContext:
         {{- include "spire-lib.securitycontext" . | nindent 8 }}
   restartPolicy: Never

charts/spire/charts/spire-server/templates/tornjak-config.yaml

@@ -10,22 +10,25 @@ data:
       spire_socket_path = "unix:///tmp/spire-server/private/api.sock" # socket to communicate with SPIRE server
       {{- if eq (include "spire-tornjak.connectionType" .) "http" }}
       http {
+        enabled = true # if true, opens HTTP server
         port = "10000" # if HTTP enabled, opens HTTP listen port at specified container port
       }
       {{- end }}
       {{- if eq (include "spire-tornjak.connectionType" .) "tls" }}
-      https {
+      tls {
+        enabled = true
         port = "10443" # container port for TLS connection
         cert = "/opt/spire/server/tls.crt" # TLS server cert
         key  = "/opt/spire/server/tls.key"  # TLS server key
       }
       {{- end }}
       {{- if eq (include "spire-tornjak.connectionType" .) "mtls" }}
-      https {
+      mtls {
+        enabled = true
         port = "10443" # container port for mTLS connection
         cert = "/opt/spire/server/tls.crt" # mTLS server cert
         key  = "/opt/spire/server/tls.key"  # mTLS server key
-        client_ca   = "/opt/spire/user/ca.crt"  # mTLS user CA
+        ca   = "/opt/spire/user/ca.crt"  # mTLS user CA
       }
       {{- end }}
     }
@@ -40,7 +43,7 @@ data:
       }
     {{- end }}
     {{- if ne .Values.tornjak.config.userManagement.issuer "" }}
-      Authenticator "Keycloak" {
+      UserManagement "KeycloakAuth" {
         plugin_data {
           issuer = "{{ .Values.tornjak.config.userManagement.issuer }}"
           audience = "{{ .Values.tornjak.config.userManagement.audience }}"

charts/spire/charts/spire-server/values.yaml

@@ -167,9 +167,7 @@ dataStore:
     username: spire
     ## @param dataStore.sql.password Only used when type != "sqlite3"
     password: ""
-    ## @param dataStore.sql.file Data source file. Only used when type == "sqlite3"
-    file: "/run/spire/data/datastore.sqlite3"
-    ## @param dataStore.sql.options [array] takes an array of objects of form {<key>: <value>} to use when building the database connection string
+    ## @param dataStore.sql.options [array] Only used when type != "sqlite3"
     options: []
 
     ## @param dataStore.sql.rootCAPath Path to Root CA bundle (MySQL only)
@@ -236,7 +234,7 @@ clusterName: example-cluster
 ## @param trustDomain Set the trust domain to be used for the SPIFFE identifiers
 trustDomain: example.org
 
-## @param bundleConfigMap Set the Configmap name for SPIRE bundle
+## @param bundleConfigMap Set the trust domain to be used for the SPIFFE identifiers
 bundleConfigMap: spire-bundle
 
 ## @param clusterDomain This is the value of your clusters `kubeadm init --service-dns-domain` flag
@@ -340,34 +338,6 @@ caSubject:
   commonName: example.org
 
 credentialComposer:
-  cel:
-    ## @param credentialComposer.cel.enabled Enable the cel based credential composer
-    enabled: false
-    ## @param credentialComposer.cel.image.registry The OCI registry to pull the image from
-    ## @param credentialComposer.cel.image.repository The repository within the registry
-    ## @param credentialComposer.cel.image.pullPolicy The image pull policy
-    ## @param credentialComposer.cel.image.tag Overrides the image tag
-    ##
-    image:
-      registry: ghcr.io
-      repository: spiffe/spire-credentialcomposer-cel
-      pullPolicy: IfNotPresent
-      tag: "0.0.2"
-    ## @param credentialComposer.cel.checksum The sha256 checksum of the plugin binary
-    checksum: 23fa1d10f15ad5d5c555930cf82289c664801d7d5609bfd8847f95a0a667e4e4
-    ## @param credentialComposer.cel.pluginPath The filename in the container of the plugin
-    pluginPath: /ko-app/cmd
-    jwt:
-      ## @param credentialComposer.cel.jwt.expression The expression to use for jwt token composing
-      expression: ""
-      #expression: |
-      #  spire.plugin.server.credentialcomposer.v1.ComposeWorkloadJWTSVIDResponse{
-      #    attributes: spire.plugin.server.credentialcomposer.v1.JWTSVIDAttributes{
-      #      claims: request.attributes.claims.mapOverrideEntries(
-      #        {'newclaim': "value"}
-      #      )
-      #    }
-      #  }
   uniqueID:
     ## @param credentialComposer.uniqueID.enabled Add the x509UniqueIdentifier attribute to workload X509-SVIDs
     enabled: false
@@ -514,16 +484,12 @@ upstreamAuthority:
 notifier:
   k8sBundle:
     ## @param notifier.k8sBundle.enabled Enable local k8s bundle uploader
-    enabled: false
+    enabled: true
     ## @param notifier.k8sBundle.namespace Namespace to push the bundle into, if blank will default to SPIRE Server namespace
     namespace: ""
-    ## @param notifier.k8sBundle.apiServiceLabel If set, rotate the CA Bundle in API services with this label set to true.
-    apiServiceLabel: ""
-    ## @param notifier.k8sBundle.webhookLabel If set, rotate the CA Bundle in validating and mutating webhooks with this label set to true.
-    webhookLabel: ""
   externalK8sBundle:
     ## @param notifier.externalK8sBundle.enabled Enable external k8s bundle uploader
-    enabled: false
+    enabled: true
     defaults:
       ## @param notifier.externalK8sBundle.defaults.namespace Namespace to push the bundle into on clusters
       namespace: "spire-system"
@@ -541,9 +507,6 @@ controllerManager:
   ## @param controllerManager.enabled Flag to enable controller manager
   enabled: false
 
-  ## @param controllerManager.staticManifestMode Flag to configure static mode. Valid options off, internal, and external. If internal, the identities config options will be rendered to an included configmap
-  staticManifestMode: "off"
-
   ## @param controllerManager.className specify to use an explicit class name. If empty, it will be automatically set to Release.Namespace-Release.Name to not conflict with other installs, enabling parallel installs.
   className: ""
   ## @param controllerManager.watchClassless specify to process custom resources without class name specified. Useful to slowly migrate to class names from classless installs. Do not have two installs on the same k8s cluster both set to true.
@@ -577,7 +540,7 @@ controllerManager:
     registry: ghcr.io
     repository: spiffe/spire-controller-manager
     pullPolicy: IfNotPresent
-    tag: "0.6.2"
+    tag: "0.6.0"
 
   ## @param controllerManager.resources [object] Resource requests and limits for controller manager
   resources: {}
@@ -695,28 +658,6 @@ controllerManager:
         ## @param controllerManager.identities.clusterSPIFFEIDs.test-keys.type The type of rule this is.
         type: test-keys
 
-      spike-keeper:
-        ## @param controllerManager.identities.clusterSPIFFEIDs.spike-keeper.enabled Enable this identity for controller manager
-        enabled: true
-        ## @param controllerManager.identities.clusterSPIFFEIDs.spike-keeper.type The type of rule this is.
-        type: spike-keeper
-        ## @param controllerManager.identities.clusterSPIFFEIDs.spike-keeper.spiffeIDTemplate The template to use for this rule.
-        spiffeIDTemplate: spiffe://{{ .TrustDomain }}/spike/keeper
-      spike-nexus:
-        ## @param controllerManager.identities.clusterSPIFFEIDs.spike-nexus.enabled Enable this identity for controller manager
-        enabled: true
-        ## @param controllerManager.identities.clusterSPIFFEIDs.spike-nexus.type The type of rule this is.
-        type: spike-nexus
-        ## @param controllerManager.identities.clusterSPIFFEIDs.spike-nexus.spiffeIDTemplate The template to use for this rule.
-        spiffeIDTemplate: spiffe://{{ .TrustDomain }}/spike/nexus
-      spike-pilot:
-        ## @param controllerManager.identities.clusterSPIFFEIDs.spike-pilot.enabled Enable this identity for controller manager
-        enabled: true
-        ## @param controllerManager.identities.clusterSPIFFEIDs.spike-pilot.type The type of rule this is.
-        type: spike-pilot
-        ## @param controllerManager.identities.clusterSPIFFEIDs.spike-pilot.spiffeIDTemplate The template to use for this rule.
-        spiffeIDTemplate: spiffe://{{ .TrustDomain }}/spike/pilot/role/superuser
-
       # You can specify additional ClusterSPIFFEIDs following this example:
       # foo:
       #   labels:
@@ -825,21 +766,10 @@ tools:
     ## @param tools.kubectl.image.tag Overrides the image tag whose default is the chart appVersion
     ##
     image:
-      registry: registry.k8s.io
-      repository: kubectl
+      registry: docker.io
+      repository: rancher/kubectl
       pullPolicy: IfNotPresent
       tag: ""
-  busybox:
-    ## @param tools.busybox.image.registry The OCI registry to pull the image from
-    ## @param tools.busybox.image.repository The repository within the registry
-    ## @param tools.busybox.image.pullPolicy The image pull policy
-    ## @param tools.busybox.image.tag Overrides the image tag whose default is the chart appVersion
-    ##
-    image:
-      registry: ""
-      repository: busybox
-      pullPolicy: IfNotPresent
-      tag: 1.37.0-uclibc
 
 telemetry:
   prometheus:
@@ -852,13 +782,6 @@ telemetry:
       namespace: ""
       ## @param telemetry.prometheus.podMonitor.labels [object] Pod labels to filter for prometheus monitoring
       labels: {}
-  datadog:
-    ## @param telemetry.datadog.enabled Flag to enable datadog monitoring
-    enabled: false
-    ## @param telemetry.datadog.address The address of the datadog service to send metrics to. The default URL for services are `<service-name>.<namespace>.svc`
-    address: "datadog.kube-system.svc"
-    ## @param telemetry.datadog.port The port of the datadog service to send metrics to
-    port: 8125
 
 ingress:
   ## @param ingress.enabled Flag to enable ingress
@@ -912,8 +835,6 @@ initContainers: []
 caKeyType: rsa-2048
 ## @param caTTL TTL for CA
 caTTL: 24h
-## @param agentTTL The TTL to use for agent SVIDs. If unset, the defaultX509SvidTTL will be used.
-agentTTL: ""
 ## @param defaultX509SvidTTL TTL for X509 Svids
 defaultX509SvidTTL: 4h
 ## @param defaultJwtSvidTTL TTL for JWT Svids
@@ -972,50 +893,21 @@ nodeAttestor:
     ## @param nodeAttestor.tpmDirect.image.tag Overrides the image tag
     ##
     image:
-      registry: ghcr.io
-      repository: spiffe/spire-tpm-plugin-tpm-attestor-server
+      registry: docker.io
+      repository: boxboat/spire-tpm-plugin-tpm-attestor-server
       pullPolicy: IfNotPresent
-      tag: "v1.9.0"
+      tag: "v1.8.7"
     ## @param nodeAttestor.tpmDirect.checksum The sha256 checksum of the plugin binary
-    checksum: 46d0caad8c25a027dd11c93e18b58a8bc6fbd9f1fe2e36fa2a0dd440986de4dc
+    checksum: f39ef9cdd2b3dd74112bfe827b79d6721c59215d0d5f4c2e34fa09bbc60d36d2
     ## @param nodeAttestor.tpmDirect.pluginPath The filename in the container of the plugin
     pluginPath: /app/tpm_attestor_server
     ## @param nodeAttestor.tpmDirect.cas A dictionary of TPM CA PEM or DER files that are allowed to connect.
     cas: {}
     ## @param nodeAttestor.tpmDirect.hashes A list of TPM hashes that are allowed to connect.
     hashes: []
-  awsIID:
-    ## @param nodeAttestor.awsIID.enabled Enable the aws_iid node attestor
-    enabled: false
-    ## @param nodeAttestor.awsIID.assumeRole AWS IAM Role NAME to use for the attestation
-    assumeRole: ""
 
 # The secrets needed for this plugin are configured in the secrets: section
 bundlePublisher:
-  k8sConfigMap:
-    ## @param bundlePublisher.k8sConfigMap.enabled Enable local k8s bundle uploader
-    enabled: true
-    ## @param bundlePublisher.k8sConfigMap.namespace Namespace to push the bundle into, if blank will default to SPIRE Server namespace
-    namespace: ""
-    ## @param bundlePublisher.k8sConfigMap.format Format of the trust bundle. Can be pem or spiffe
-    format: spiffe
-  externalK8sConfigMap:
-    ## @param bundlePublisher.externalK8sConfigMap.enabled Enable external k8s bundle uploader
-    enabled: true
-    defaults:
-      ## @param bundlePublisher.externalK8sConfigMap.defaults.namespace Namespace to push the bundle into on clusters
-      namespace: "spire-system"
-      ## @param bundlePublisher.externalK8sConfigMap.defaults.configMapName ConfigMap name to push the bundle into on external clusters
-      configMapName: "spire-bundle-upstream"
-      ## @param bundlePublisher.externalK8sConfigMap.defaults.configMapKey ConfigMap key to push the bundle into on external clusters
-      configMapKey: ""
-      ## @param bundlePublisher.externalK8sConfigMap.defaults.format Format of the trust bundle. Can be pem or spiffe
-      format: spiffe
-    ## @param bundlePublisher.externalK8sConfigMap.clusters [object] A dictionary of clusters to add with optional overrides. If empty, all clusters defined in kubeConfigs will be used.
-    clusters: {}
-    # clustera:
-    #   namespace: foo
-    # clusterb: {}
   awsRolesAnywhereTrustAnchor:
     ## @param bundlePublisher.awsRolesAnywhereTrustAnchor.enabled Enable the AWS S3 bundle publisher
     enabled: false
@@ -1026,8 +918,6 @@ bundlePublisher:
   awsS3:
     ## @param bundlePublisher.awsS3.enabled Enable the AWS S3 bundle publisher
     enabled: false
-    ## @param bundlePublisher.awsS3.endpoint A custom S3 endpoint should be set when using third-party object storage providers, such as Minio.
-    endpoint: ""
     ## @param bundlePublisher.awsS3.region AWS region to store the trust bundle
     region: ""
     ## @param bundlePublisher.awsS3.bucket AWS S3 bucket name to which the trust bundle is uploaded
@@ -1061,7 +951,7 @@ tornjak:
     repository: spiffe/tornjak-backend
     pullPolicy: IfNotPresent
     tag: ""
-    defaultTag: "v2.1.0"
+    defaultTag: "v1.6.0"
 
   service:
     ## @param tornjak.service.type Type of service resource
@@ -1205,10 +1095,10 @@ chown:
   ## @param chown.image.tag Overrides the image tag whose default is the chart appVersion
   ##
   image:
-    registry: ""
-    repository: busybox
+    registry: cgr.dev
+    repository: chainguard/bash
     pullPolicy: Always
-    tag: 1.37.0-uclibc
+    tag: latest@sha256:a5cd47a3caf0668c48c6ad4bb66436cab40aa335634f3b5740ffd2a0c39770b2
 
   ## @param chown.resources Specify resource needs as per https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
   resources: {}
@@ -1243,7 +1133,7 @@ tests:
       registry: cgr.dev
       repository: chainguard/bash
       pullPolicy: IfNotPresent
-      tag: latest@sha256:330ad2ea11cf3018a331326fb08e44cedd0c0c604cfbfcff32b81272460bb679
+      tag: latest@sha256:a5cd47a3caf0668c48c6ad4bb66436cab40aa335634f3b5740ffd2a0c39770b2
 
 ## @param kubeConfigs [object] Manage additional kubeconfig files to talk to external Kubernetes clusters
 kubeConfigs: {}