Skip to content

Commit aabc73b

Browse files
faisal-memonfaisal-memon
committed
Merge branch 'main' into release
2 parents e672cfc + e1a1484 commit aabc73b

File tree

28 files changed

+123
-109
lines changed

28 files changed

+123
-109
lines changed

‎.github/tests/charts.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
{
33
"name": "kube-prometheus-stack",
44
"repo": "https://prometheus-community.github.io/helm-charts",
5-
"version": "77.10.0"
5+
"version": "79.7.1"
66
},
77
{
88
"name": "cert-manager",
99
"repo": "https://charts.jetstack.io",
10-
"version": "v1.18.2"
10+
"version": "v1.19.1"
1111
},
1212
{
1313
"name": "ingress-nginx",
1414
"repo": "https://kubernetes.github.io/ingress-nginx",
15-
"version": "4.13.2"
15+
"version": "4.14.0"
1616
}
1717
]

‎.github/tests/dependencies/mysql.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
fullnameOverride: mysql
12
primary:
23
containerSecurityContext:
34
allowPrivilegeEscalation: false

‎.github/tests/oci-charts.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[
22
{
3-
"name": "mysql",
4-
"registry": "docker.io/bitnamicharts/mysql",
5-
"version": "14.0.3"
3+
"name": "mariadb",
4+
"registry": "docker.io/bitnamicharts/mariadb",
5+
"version": "23.2.4"
66
},
77
{
88
"name": "postgresql",
99
"registry": "docker.io/bitnamicharts/postgresql",
10-
"version": "16.7.9"
10+
"version": "18.1.9"
1111
},
1212
{
1313
"name": "envoy-gateway",
1414
"registry": "docker.io/envoyproxy/gateway-helm",
15-
"version": "v1.5.1"
15+
"version": "v1.6.0"
1616
}
1717
]

‎.github/tests/pre-install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ kubectl wait --namespace ingress-nginx --for=condition=ready --timeout 60s pod -
3737
# external database
3838

3939
# mysql
40-
"${helm_install[@]}" mysql "${HELM_REGISTRY_MYSQL}" --version "$VERSION_MYSQL" \
40+
"${helm_install[@]}" mysql "${HELM_REGISTRY_MARIADB}" --version "$VERSION_MARIADB" \
4141
--namespace mysql \
4242
--values "${DEPS}/mysql.yaml" \
4343
--wait

‎charts/spire-nested/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: spire-nested
33
description: >
44
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.
55
type: application
6-
version: 0.27.0
7-
appVersion: "1.13.0"
6+
version: 0.27.1
7+
appVersion: "1.13.2"
88
keywords: ["spiffe", "spire", "spire-server", "spire-agent", "oidc", "spire-controller-manager"]
99
home: https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spire
1010
sources:

‎charts/spire-nested/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# spire
22

3-
![Version: 0.27.0](https://img.shields.io/badge/Version-0.27.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.0](https://img.shields.io/badge/AppVersion-1.13.0-informational?style=flat-square)
3+
![Version: 0.27.1](https://img.shields.io/badge/Version-0.27.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.2](https://img.shields.io/badge/AppVersion-1.13.2-informational?style=flat-square)
44
[![Development Phase](https://github.com/spiffe/spiffe/blob/main/.img/maturity/dev.svg)](https://github.com/spiffe/spiffe/blob/main/MATURITY.md#development)
55

66
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.

‎charts/spire/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: spire
33
description: >
44
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.
55
type: application
6-
version: 0.27.0
7-
appVersion: "1.13.0"
6+
version: 0.27.1
7+
appVersion: "1.13.2"
88
keywords: ["spiffe", "spire", "spire-server", "spire-agent", "oidc", "spire-controller-manager"]
99
home: https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spire
1010
sources:

‎charts/spire/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# spire
22

3-
![Version: 0.27.0](https://img.shields.io/badge/Version-0.27.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.0](https://img.shields.io/badge/AppVersion-1.13.0-informational?style=flat-square)
3+
![Version: 0.27.1](https://img.shields.io/badge/Version-0.27.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.2](https://img.shields.io/badge/AppVersion-1.13.2-informational?style=flat-square)
44
[![Development Phase](https://github.com/spiffe/spiffe/blob/main/.img/maturity/dev.svg)](https://github.com/spiffe/spiffe/blob/main/MATURITY.md#development)
55

66
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.

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ A Helm chart to install the SPIFFE CSI driver.
3232
| `image.repository` | The repository within the registry | `spiffe/spiffe-csi-driver` |
3333
| `image.pullPolicy` | The image pull policy | `IfNotPresent` |
3434
| `image.tag` | Overrides the image tag whose default is the chart appVersion | `""` |
35-
| `resources` | Resource requests and limits for spiffe-csi-driver | `{}` |
35+
| `resources` | Resource requests and limits for spiffe-csi-driver and its initContainers | `{}` |
3636
| `extraEnvVars` | Extra environment variables to be added to the spiffe-csi-driver container | `[]` |
3737
| `healthChecks.port` | The healthcheck port for spiffe-csi-driver | `9809` |
3838
| `updateStrategy.type` | The update strategy to use to replace existing DaemonSet pods with new pods. Can be RollingUpdate or OnDelete. | `RollingUpdate` |
@@ -61,7 +61,6 @@ A Helm chart to install the SPIFFE CSI driver.
6161
| `nodeDriverRegistrar.image.repository` | The repository within the registry | `sig-storage/csi-node-driver-registrar` |
6262
| `nodeDriverRegistrar.image.pullPolicy` | The image pull policy | `IfNotPresent` |
6363
| `nodeDriverRegistrar.image.tag` | Overrides the image tag | `v2.9.4` |
64-
| `nodeDriverRegistrar.resources` | Resource requests and limits for CSI driver pods | `{}` |
6564
| `nodeDriverRegistrar.extraEnvVars` | Extra environment variables to be added to the nodeDriverRegistrar container | `[]` |
6665
| `agentSocketPath` | The unix socket path to the spire-agent | `/run/spire/agent-sockets/spire-agent.sock` |
6766
| `kubeletPath` | Path to kubelet file | `/var/lib/kubelet` |
@@ -74,5 +73,5 @@ A Helm chart to install the SPIFFE CSI driver.
7473
| `selinux.image.registry` | The OCI registry to pull the image from | `registry.access.redhat.com` |
7574
| `selinux.image.repository` | The repository within the registry | `ubi9` |
7675
| `selinux.image.pullPolicy` | The image pull policy | `IfNotPresent` |
77-
| `selinux.image.tag` | Overrides the image tag whose default is the chart appVersion | `9.6-1758184894` |
76+
| `selinux.image.tag` | Overrides the image tag whose default is the chart appVersion | `9.7-1763340522` |
7877

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ spec:
6868
mountPath: /spire-agent-socket
6969
terminationMessagePolicy: File
7070
terminationMessagePath: /dev/termination-log
71+
resources:
72+
{{- toYaml .Values.resources | nindent 12 }}
7173
{{- end }}
7274
{{- if gt (len .Values.initContainers) 0 }}
7375
{{- toYaml .Values.initContainers | nindent 8 }}
@@ -147,7 +149,7 @@ spec:
147149
port: healthz
148150
{{- toYaml .Values.livenessProbe | nindent 12 }}
149151
resources:
150-
{{- toYaml .Values.nodeDriverRegistrar.resources | nindent 12 }}
152+
{{- toYaml .Values.resources | nindent 12 }}
151153
volumes:
152154
- name: spire-agent-socket-dir
153155
hostPath:

0 commit comments

Comments
 (0)