Skip to content

Commit 98e35be

Browse files
schnattererThomas Michael
and
Thomas Michael
authored
Upgrade ingress-nginx (#271)
* Upgrade ingress-nginx Fixes cve-2025-1974 https://kubernetes.io/blog/2025/03/24/ingress-nginx-cve-2025-1974/ * update nginx in developers.md --------- Co-authored-by: Thomas Michael <[email protected]>
1 parent 735404d commit 98e35be

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Diff for: docs/developers.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ skopeo copy docker://ghcr.io/cloudogu/mailhog:v1.0.1 --dest-creds Proxy:Proxy123
568568
skopeo copy docker://ghcr.io/external-secrets/external-secrets:v0.9.16 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/external-secrets
569569
skopeo copy docker://hashicorp/vault:1.14.0 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/vault
570570
skopeo copy docker://bitnami/nginx:1.23.3-debian-11-r8 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/nginx
571-
skopeo copy docker://registry.k8s.io/ingress-nginx/controller:v1.9.6 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/ingress-nginx
571+
skopeo copy docker://registry.k8s.io/ingress-nginx/controller:v1.12.1 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/ingress-nginx
572572
573573
# Monitoring
574574
# Using latest will lead to failure with

Diff for: src/main/groovy/com/cloudogu/gitops/config/Config.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ class Config {
649649
IngressNginxHelmSchema helm = new IngressNginxHelmSchema(
650650
chart: 'ingress-nginx',
651651
repoURL: 'https://kubernetes.github.io/ingress-nginx',
652-
version: '4.11.3'
652+
version: '4.12.1'
653653
)
654654
static class IngressNginxHelmSchema extends HelmConfigWithValues {
655655
@Option(names = ['--ingress-nginx-image'], description = HELM_CONFIG_IMAGE_DESCRIPTION)

Diff for: src/test/groovy/com/cloudogu/gitops/features/IngressNginxTest.groovy

+5-5
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ class IngressNginxTest {
4141
def actual = parseActualYaml()
4242
assertThat(actual['controller']['replicaCount']).isEqualTo(2)
4343

44-
verify(deploymentStrategy).deployFeature('https://kubernetes.github.io/ingress-nginx', 'ingress-nginx',
45-
'ingress-nginx', '4.11.3','ingress-nginx',
44+
verify(deploymentStrategy).deployFeature(config.features.ingressNginx.helm.repoURL, 'ingress-nginx',
45+
config.features.ingressNginx.helm.chart, config.features.ingressNginx.helm.version,'ingress-nginx',
4646
'ingress-nginx', temporaryYamlFile)
4747
assertThat(parseActualYaml()['controller']['resources']).isNull()
4848
assertThat(parseActualYaml()['controller']['metrics']).isNull()
@@ -104,9 +104,9 @@ class IngressNginxTest {
104104

105105
def helmConfig = ArgumentCaptor.forClass(Config.HelmConfig)
106106
verify(airGappedUtils).mirrorHelmRepoToGit(helmConfig.capture())
107-
assertThat(helmConfig.value.chart).isEqualTo('ingress-nginx')
108-
assertThat(helmConfig.value.repoURL).isEqualTo('https://kubernetes.github.io/ingress-nginx')
109-
assertThat(helmConfig.value.version).isEqualTo('4.11.3')
107+
assertThat(helmConfig.value.chart).isEqualTo(config.features.ingressNginx.helm.chart)
108+
assertThat(helmConfig.value.repoURL).isEqualTo(config.features.ingressNginx.helm.repoURL)
109+
assertThat(helmConfig.value.version).isEqualTo(config.features.ingressNginx.helm.version)
110110
verify(deploymentStrategy).deployFeature(
111111
'http://scmm-scm-manager.default.svc.cluster.local/scm/repo/a/b',
112112
'ingress-nginx', '.', '1.2.3','ingress-nginx',

0 commit comments

Comments
 (0)