Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improvement(k8s): update ingress controller to 1.12.0 (Helm chart 4.12.0) #6789

Merged
merged 4 commits into from
Jan 30, 2025
Merged

improvement(k8s): update ingress controller to 1.12.0 (Helm chart 4.12.0) #6789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90b64eb
chore: update ingress controller helm chart
vvagaytsev Jan 21, 2025
0b56e51
chore: update ingress controller version in kind manifests
vvagaytsev Jan 21, 2025
d2a709f
chore: update ingress controller image in kind manifests
vvagaytsev Jan 21, 2025
3ba5b09
chore: update kube-webhook-certgen image in kind manifests
vvagaytsev Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/plugins/kubernetes/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,6 @@ export function getDefaultGardenIngressControllerDefaultBackendImagePath(
export const defaultKanikoImageName: DockerImageWithDigest =
"gcr.io/kaniko-project/executor:v1.11.0-debug@sha256:32ba2214921892c2fa7b5f9c4ae6f8f026538ce6b2105a93a36a8b5ee50fe517"
export const defaultGardenIngressControllerImage: DockerImageWithDigest =
"k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2"
"registry.k8s.io/ingress-nginx/controller:v1.12.0@sha256:e6b8de175acda6ca913891f0f727bca4527e797d52688cbe9fec9040d6f6b6fa"
export const defaultGardenIngressControllerKubeWebhookCertGenImage: DockerImageWithDigest =
"k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660"
"registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.1@sha256:0de05718b59dc33b57ddfb4d8ad5f637cefd13eafdec0e1579d782b3483c27c3"
2 changes: 1 addition & 1 deletion core/src/plugins/kubernetes/nginx/nginx-helm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { GardenIngressComponent } from "./ingress-controller-base.js"
import { styles } from "../../../logger/styles.js"

const HELM_INGRESS_NGINX_REPO = "https://kubernetes.github.io/ingress-nginx"
const HELM_INGRESS_NGINX_VERSION = "4.0.13"
const HELM_INGRESS_NGINX_VERSION = "4.12.0"
const HELM_INGRESS_NGINX_CHART = "ingress-nginx"
const HELM_INGRESS_NGINX_RELEASE_NAME = "garden-nginx"
const HELM_INGRESS_NGINX_DEPLOYMENT_TIMEOUT = "300s"
Expand Down
42 changes: 22 additions & 20 deletions core/src/plugins/kubernetes/nginx/nginx-kind-manifests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import {
defaultGardenIngressControllerKubeWebhookCertGenImage,
} from "../constants.js"

const INGRESS_NGINX_CONTROLLER_VERSION = "1.12.0"

export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
return [
{
Expand All @@ -23,7 +25,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx-controller",
namespace,
Expand Down Expand Up @@ -62,7 +64,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx-controller-admission",
namespace,
Expand Down Expand Up @@ -107,7 +109,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx-controller",
namespace,
Expand All @@ -123,7 +125,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx",
namespace,
Expand All @@ -138,7 +140,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx-admission",
namespace,
Expand All @@ -152,7 +154,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx",
},
Expand Down Expand Up @@ -203,7 +205,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx-admission",
},
Expand All @@ -224,7 +226,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx",
namespace,
Expand Down Expand Up @@ -287,7 +289,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx-admission",
namespace,
Expand All @@ -309,7 +311,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx",
namespace,
Expand All @@ -336,7 +338,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx-admission",
namespace,
Expand All @@ -362,7 +364,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx",
},
Expand All @@ -388,7 +390,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx-admission",
},
Expand All @@ -414,7 +416,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx-controller",
namespace,
Expand Down Expand Up @@ -591,7 +593,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx-admission-create",
namespace,
Expand All @@ -604,7 +606,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx-admission-create",
},
Expand Down Expand Up @@ -658,7 +660,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx-admission-patch",
namespace,
Expand All @@ -671,7 +673,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx-admission-patch",
},
Expand Down Expand Up @@ -727,7 +729,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
annotations: {
"ingressclass.kubernetes.io/is-default-class": "true",
Expand All @@ -747,7 +749,7 @@ export function kindNginxGetManifests(namespace: string): KubernetesResource[] {
"app.kubernetes.io/instance": "ingress-nginx",
"app.kubernetes.io/name": "ingress-nginx",
"app.kubernetes.io/part-of": "ingress-nginx",
"app.kubernetes.io/version": "1.1.3",
"app.kubernetes.io/version": INGRESS_NGINX_CONTROLLER_VERSION,
},
name: "ingress-nginx-admission",
},
Expand Down