Skip to content

Commit 27da75f

Browse files
committed
Merge branch 'main' into release
2 parents 815e207 + 0b906b6 commit 27da75f

File tree

25 files changed

+255
-119
lines changed

25 files changed

+255
-119
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": "70.7.0"
5+
"version": "72.5.0"
66
},
77
{
88
"name": "cert-manager",
99
"repo": "https://charts.jetstack.io",
10-
"version": "v1.17.1"
10+
"version": "v1.17.2"
1111
},
1212
{
1313
"name": "ingress-nginx",
1414
"repo": "https://kubernetes.github.io/ingress-nginx",
15-
"version": "4.12.1"
15+
"version": "4.12.2"
1616
}
1717
]

.github/tests/images.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
"query": "chown.image",
1010
"filter": "LATESTSHA",
1111
"sort-flags": []
12+
},
13+
{
14+
"query": "tools.bash.image",
15+
"filter": "LATESTSHA",
16+
"sort-flags": []
1217
}
1318
],
1419
"spire-agent/values.yaml": [

.github/tests/oci-charts.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
{
33
"name": "mysql",
44
"registry": "docker.io/bitnamicharts/mysql",
5-
"version": "12.3.4"
5+
"version": "13.0.0"
66
},
77
{
88
"name": "postgresql",
99
"registry": "docker.io/bitnamicharts/postgresql",
10-
"version": "16.6.3"
10+
"version": "16.7.4"
1111
},
1212
{
1313
"name": "envoy-gateway",
1414
"registry": "docker.io/envoyproxy/gateway-helm",
15-
"version": "v1.3.2"
15+
"version": "v1.4.0"
1616
}
1717
]

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.24.5
7-
appVersion: "1.12.0"
6+
version: 0.25.0
7+
appVersion: "1.12.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.24.5](https://img.shields.io/badge/Version-0.24.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.12.0](https://img.shields.io/badge/AppVersion-1.12.0-informational?style=flat-square)
3+
![Version: 0.25.0](https://img.shields.io/badge/Version-0.25.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.12.2](https://img.shields.io/badge/AppVersion-1.12.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.24.5
7-
appVersion: "1.12.0"
6+
version: 0.25.0
7+
appVersion: "1.12.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.24.5](https://img.shields.io/badge/Version-0.24.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.12.0](https://img.shields.io/badge/AppVersion-1.12.0-informational?style=flat-square)
3+
![Version: 0.25.0](https://img.shields.io/badge/Version-0.25.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.12.2](https://img.shields.io/badge/AppVersion-1.12.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-oidc-discovery-provider/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: spiffe-oidc-discovery-provider
33
description: A Helm chart to install the SPIFFE OIDC discovery provider.
44
type: application
55
version: 0.1.0
6-
appVersion: "1.12.0"
6+
appVersion: "1.12.2"
77
keywords: ["spiffe", "oidc"]
88
home: https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spire
99
sources:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ A Helm chart to install the SPIFFE OIDC discovery provider.
7171
| `insecureScheme.nginx.image.registry` | The OCI registry to pull the image from. Only used when TLS is disabled. | `docker.io` |
7272
| `insecureScheme.nginx.image.repository` | The repository within the registry. Only used when TLS is disabled. | `nginxinc/nginx-unprivileged` |
7373
| `insecureScheme.nginx.image.pullPolicy` | The image pull policy. Only used when TLS is disabled. | `IfNotPresent` |
74-
| `insecureScheme.nginx.image.tag` | Overrides the image tag whose default is the chart appVersion. Only used when TLS is disabled. | `1.27.4-alpine` |
74+
| `insecureScheme.nginx.image.tag` | Overrides the image tag whose default is the chart appVersion. Only used when TLS is disabled. | `1.28.0-alpine` |
7575
| `insecureScheme.nginx.ipMode` | IP modes supported by the cluster. Must be one of [ipv4, ipv6, both] | `both` |
7676
| `insecureScheme.nginx.resources` | Resource requests and limits | `{}` |
7777
| `jwtIssuer` | Path to JWT issuer. Defaults to oidc-discovery.$trustDomain if unset | `""` |
@@ -104,7 +104,7 @@ A Helm chart to install the SPIFFE OIDC discovery provider.
104104
| `telemetry.prometheus.nginxExporter.image.registry` | The OCI registry to pull the image from | `docker.io` |
105105
| `telemetry.prometheus.nginxExporter.image.repository` | The repository within the registry | `nginx/nginx-prometheus-exporter` |
106106
| `telemetry.prometheus.nginxExporter.image.pullPolicy` | The image pull policy | `IfNotPresent` |
107-
| `telemetry.prometheus.nginxExporter.image.tag` | Overrides the image tag whose default is the chart appVersion | `1.4.1` |
107+
| `telemetry.prometheus.nginxExporter.image.tag` | Overrides the image tag whose default is the chart appVersion | `1.4.2` |
108108
| `telemetry.prometheus.nginxExporter.resources` | Resource requests and limits | `{}` |
109109
| `ingress.enabled` | Flag to enable ingress | `false` |
110110
| `ingress.className` | Ingress class name | `""` |
@@ -120,11 +120,11 @@ A Helm chart to install the SPIFFE OIDC discovery provider.
120120
| `tests.bash.image.registry` | The OCI registry to pull the image from | `cgr.dev` |
121121
| `tests.bash.image.repository` | The repository within the registry | `chainguard/bash` |
122122
| `tests.bash.image.pullPolicy` | The image pull policy | `IfNotPresent` |
123-
| `tests.bash.image.tag` | Overrides the image tag whose default is the chart appVersion | `latest@sha256:0cc351822c8e066b93d28344713d1a6cbad83e3ee4906d137d7a4e85d9a06f73` |
123+
| `tests.bash.image.tag` | Overrides the image tag whose default is the chart appVersion | `latest@sha256:57ed0cb7b67f52ea7678128da5c4cf99c1a71d269db92a6a40c179fa57f00ce4` |
124124
| `tests.toolkit.image.registry` | The OCI registry to pull the image from | `cgr.dev` |
125125
| `tests.toolkit.image.repository` | The repository within the registry | `chainguard/min-toolkit-debug` |
126126
| `tests.toolkit.image.pullPolicy` | The image pull policy | `IfNotPresent` |
127-
| `tests.toolkit.image.tag` | Overrides the image tag whose default is the chart appVersion | `latest@sha256:2f8ac6547029ed217bb40167bf39883b4bc606b3b747ecaf710fab9779ef786f` |
127+
| `tests.toolkit.image.tag` | Overrides the image tag whose default is the chart appVersion | `latest@sha256:3e5ee5ed41e764999f8e499b48d2e62d1f8ffd526aad5b4c3aa7a0759e0139db` |
128128
| `tests.step.image.registry` | The OCI registry to pull the image from | `docker.io` |
129129
| `tests.step.image.repository` | The repository within the registry | `smallstep/step-cli` |
130130
| `tests.step.image.pullPolicy` | The image pull policy | `IfNotPresent` |

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ insecureScheme:
170170
registry: docker.io
171171
repository: nginxinc/nginx-unprivileged
172172
pullPolicy: IfNotPresent
173-
tag: 1.27.4-alpine
173+
tag: 1.28.0-alpine
174174
## @param insecureScheme.nginx.ipMode IP modes supported by the cluster. Must be one of [ipv4, ipv6, both]
175175
ipMode: both
176176
## @param insecureScheme.nginx.resources Resource requests and limits
@@ -274,7 +274,7 @@ telemetry:
274274
registry: docker.io
275275
repository: nginx/nginx-prometheus-exporter
276276
pullPolicy: IfNotPresent
277-
tag: "1.4.1"
277+
tag: "1.4.2"
278278

279279
## @param telemetry.prometheus.nginxExporter.resources [object] Resource requests and limits
280280
resources: {}
@@ -340,7 +340,7 @@ tests:
340340
registry: cgr.dev
341341
repository: chainguard/bash
342342
pullPolicy: IfNotPresent
343-
tag: latest@sha256:0cc351822c8e066b93d28344713d1a6cbad83e3ee4906d137d7a4e85d9a06f73
343+
tag: latest@sha256:57ed0cb7b67f52ea7678128da5c4cf99c1a71d269db92a6a40c179fa57f00ce4
344344

345345
toolkit:
346346
## @param tests.toolkit.image.registry The OCI registry to pull the image from
@@ -352,7 +352,7 @@ tests:
352352
registry: cgr.dev
353353
repository: chainguard/min-toolkit-debug
354354
pullPolicy: IfNotPresent
355-
tag: latest@sha256:2f8ac6547029ed217bb40167bf39883b4bc606b3b747ecaf710fab9779ef786f
355+
tag: latest@sha256:3e5ee5ed41e764999f8e499b48d2e62d1f8ffd526aad5b4c3aa7a0759e0139db
356356

357357
step:
358358
## @param tests.step.image.registry The OCI registry to pull the image from

0 commit comments

Comments
 (0)