Skip to content

Commit eef9ad2

Browse files
rikatzrikatz
committed
Release new helm chart with certgen fixed (kubernetes#7478)
* Update go version, modules and remove ioutil * Release new helm chart with certgen fixed
1 parent 0affd96 commit eef9ad2

File tree

11 files changed

+344
-342
lines changed

11 files changed

+344
-342
lines changed

‎charts/ingress-nginx/Chart.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: ingress-nginx
33
# When the version is modified, make sure the artifacthub.io/changes list is updated
44
# Also update CHANGELOG.md
5-
version: 4.0.0
6-
appVersion: 1.0.0-beta.1
5+
version: 4.0.0-beta.2
6+
appVersion: 1.0.0-beta.2
77
home: https://github.com/kubernetes/ingress-nginx
88
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
99
icon: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/Nginx_logo.svg/500px-Nginx_logo.svg.png
@@ -25,3 +25,4 @@ annotations:
2525
# https://artifacthub.io/packages/helm/ingress-nginx/ingress-nginx?modal=changelog
2626
artifacthub.io/changes: |
2727
- Drop support for extensions/v1beta1, networking.k8s.io/v1beta1
28+
- Change webhook-certgen to use internal image

‎charts/ingress-nginx/values.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -547,12 +547,13 @@ controller:
547547
patch:
548548
enabled: true
549549
image:
550-
registry: docker.io
551-
image: jettech/kube-webhook-certgen
550+
registry: k8s.gcr.io
551+
image: ingress-nginx/kube-webhook-certgen
552552
# for backwards compatibility consider setting the full image url via the repository value below
553553
# use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
554554
# repository:
555-
tag: v1.5.1
555+
tag: v1.0
556+
digest: sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
556557
pullPolicy: IfNotPresent
557558
## Provide a priority class name to the webhook patching job
558559
##

‎deploy/static/provider/aws/deploy-tls-termination.yaml

+42-42
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ apiVersion: v1
1313
kind: ServiceAccount
1414
metadata:
1515
labels:
16-
helm.sh/chart: ingress-nginx-4.0.0
16+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
1717
app.kubernetes.io/name: ingress-nginx
1818
app.kubernetes.io/instance: ingress-nginx
19-
app.kubernetes.io/version: 1.0.0-beta.1
19+
app.kubernetes.io/version: 1.0.0-beta.2
2020
app.kubernetes.io/managed-by: Helm
2121
app.kubernetes.io/component: controller
2222
name: ingress-nginx
@@ -28,10 +28,10 @@ apiVersion: v1
2828
kind: ConfigMap
2929
metadata:
3030
labels:
31-
helm.sh/chart: ingress-nginx-4.0.0
31+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
3232
app.kubernetes.io/name: ingress-nginx
3333
app.kubernetes.io/instance: ingress-nginx
34-
app.kubernetes.io/version: 1.0.0-beta.1
34+
app.kubernetes.io/version: 1.0.0-beta.2
3535
app.kubernetes.io/managed-by: Helm
3636
app.kubernetes.io/component: controller
3737
name: ingress-nginx-controller
@@ -50,10 +50,10 @@ apiVersion: rbac.authorization.k8s.io/v1
5050
kind: ClusterRole
5151
metadata:
5252
labels:
53-
helm.sh/chart: ingress-nginx-4.0.0
53+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
5454
app.kubernetes.io/name: ingress-nginx
5555
app.kubernetes.io/instance: ingress-nginx
56-
app.kubernetes.io/version: 1.0.0-beta.1
56+
app.kubernetes.io/version: 1.0.0-beta.2
5757
app.kubernetes.io/managed-by: Helm
5858
name: ingress-nginx
5959
rules:
@@ -117,10 +117,10 @@ apiVersion: rbac.authorization.k8s.io/v1
117117
kind: ClusterRoleBinding
118118
metadata:
119119
labels:
120-
helm.sh/chart: ingress-nginx-4.0.0
120+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
121121
app.kubernetes.io/name: ingress-nginx
122122
app.kubernetes.io/instance: ingress-nginx
123-
app.kubernetes.io/version: 1.0.0-beta.1
123+
app.kubernetes.io/version: 1.0.0-beta.2
124124
app.kubernetes.io/managed-by: Helm
125125
name: ingress-nginx
126126
roleRef:
@@ -137,10 +137,10 @@ apiVersion: rbac.authorization.k8s.io/v1
137137
kind: Role
138138
metadata:
139139
labels:
140-
helm.sh/chart: ingress-nginx-4.0.0
140+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
141141
app.kubernetes.io/name: ingress-nginx
142142
app.kubernetes.io/instance: ingress-nginx
143-
app.kubernetes.io/version: 1.0.0-beta.1
143+
app.kubernetes.io/version: 1.0.0-beta.2
144144
app.kubernetes.io/managed-by: Helm
145145
app.kubernetes.io/component: controller
146146
name: ingress-nginx
@@ -221,10 +221,10 @@ apiVersion: rbac.authorization.k8s.io/v1
221221
kind: RoleBinding
222222
metadata:
223223
labels:
224-
helm.sh/chart: ingress-nginx-4.0.0
224+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
225225
app.kubernetes.io/name: ingress-nginx
226226
app.kubernetes.io/instance: ingress-nginx
227-
app.kubernetes.io/version: 1.0.0-beta.1
227+
app.kubernetes.io/version: 1.0.0-beta.2
228228
app.kubernetes.io/managed-by: Helm
229229
app.kubernetes.io/component: controller
230230
name: ingress-nginx
@@ -243,10 +243,10 @@ apiVersion: v1
243243
kind: Service
244244
metadata:
245245
labels:
246-
helm.sh/chart: ingress-nginx-4.0.0
246+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
247247
app.kubernetes.io/name: ingress-nginx
248248
app.kubernetes.io/instance: ingress-nginx
249-
app.kubernetes.io/version: 1.0.0-beta.1
249+
app.kubernetes.io/version: 1.0.0-beta.2
250250
app.kubernetes.io/managed-by: Helm
251251
app.kubernetes.io/component: controller
252252
name: ingress-nginx-controller-admission
@@ -274,10 +274,10 @@ metadata:
274274
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: https
275275
service.beta.kubernetes.io/aws-load-balancer-type: elb
276276
labels:
277-
helm.sh/chart: ingress-nginx-4.0.0
277+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
278278
app.kubernetes.io/name: ingress-nginx
279279
app.kubernetes.io/instance: ingress-nginx
280-
app.kubernetes.io/version: 1.0.0-beta.1
280+
app.kubernetes.io/version: 1.0.0-beta.2
281281
app.kubernetes.io/managed-by: Helm
282282
app.kubernetes.io/component: controller
283283
name: ingress-nginx-controller
@@ -304,10 +304,10 @@ apiVersion: apps/v1
304304
kind: Deployment
305305
metadata:
306306
labels:
307-
helm.sh/chart: ingress-nginx-4.0.0
307+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
308308
app.kubernetes.io/name: ingress-nginx
309309
app.kubernetes.io/instance: ingress-nginx
310-
app.kubernetes.io/version: 1.0.0-beta.1
310+
app.kubernetes.io/version: 1.0.0-beta.2
311311
app.kubernetes.io/managed-by: Helm
312312
app.kubernetes.io/component: controller
313313
name: ingress-nginx-controller
@@ -422,10 +422,10 @@ apiVersion: networking.k8s.io/v1
422422
kind: IngressClass
423423
metadata:
424424
labels:
425-
helm.sh/chart: ingress-nginx-4.0.0
425+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
426426
app.kubernetes.io/name: ingress-nginx
427427
app.kubernetes.io/instance: ingress-nginx
428-
app.kubernetes.io/version: 1.0.0-beta.1
428+
app.kubernetes.io/version: 1.0.0-beta.2
429429
app.kubernetes.io/managed-by: Helm
430430
app.kubernetes.io/component: controller
431431
name: nginx
@@ -440,10 +440,10 @@ apiVersion: admissionregistration.k8s.io/v1
440440
kind: ValidatingWebhookConfiguration
441441
metadata:
442442
labels:
443-
helm.sh/chart: ingress-nginx-4.0.0
443+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
444444
app.kubernetes.io/name: ingress-nginx
445445
app.kubernetes.io/instance: ingress-nginx
446-
app.kubernetes.io/version: 1.0.0-beta.1
446+
app.kubernetes.io/version: 1.0.0-beta.2
447447
app.kubernetes.io/managed-by: Helm
448448
app.kubernetes.io/component: admission-webhook
449449
name: ingress-nginx-admission
@@ -480,10 +480,10 @@ metadata:
480480
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
481481
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
482482
labels:
483-
helm.sh/chart: ingress-nginx-4.0.0
483+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
484484
app.kubernetes.io/name: ingress-nginx
485485
app.kubernetes.io/instance: ingress-nginx
486-
app.kubernetes.io/version: 1.0.0-beta.1
486+
app.kubernetes.io/version: 1.0.0-beta.2
487487
app.kubernetes.io/managed-by: Helm
488488
app.kubernetes.io/component: admission-webhook
489489
---
@@ -496,10 +496,10 @@ metadata:
496496
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
497497
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
498498
labels:
499-
helm.sh/chart: ingress-nginx-4.0.0
499+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
500500
app.kubernetes.io/name: ingress-nginx
501501
app.kubernetes.io/instance: ingress-nginx
502-
app.kubernetes.io/version: 1.0.0-beta.1
502+
app.kubernetes.io/version: 1.0.0-beta.2
503503
app.kubernetes.io/managed-by: Helm
504504
app.kubernetes.io/component: admission-webhook
505505
rules:
@@ -520,10 +520,10 @@ metadata:
520520
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
521521
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
522522
labels:
523-
helm.sh/chart: ingress-nginx-4.0.0
523+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
524524
app.kubernetes.io/name: ingress-nginx
525525
app.kubernetes.io/instance: ingress-nginx
526-
app.kubernetes.io/version: 1.0.0-beta.1
526+
app.kubernetes.io/version: 1.0.0-beta.2
527527
app.kubernetes.io/managed-by: Helm
528528
app.kubernetes.io/component: admission-webhook
529529
roleRef:
@@ -545,10 +545,10 @@ metadata:
545545
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
546546
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
547547
labels:
548-
helm.sh/chart: ingress-nginx-4.0.0
548+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
549549
app.kubernetes.io/name: ingress-nginx
550550
app.kubernetes.io/instance: ingress-nginx
551-
app.kubernetes.io/version: 1.0.0-beta.1
551+
app.kubernetes.io/version: 1.0.0-beta.2
552552
app.kubernetes.io/managed-by: Helm
553553
app.kubernetes.io/component: admission-webhook
554554
rules:
@@ -570,10 +570,10 @@ metadata:
570570
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
571571
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
572572
labels:
573-
helm.sh/chart: ingress-nginx-4.0.0
573+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
574574
app.kubernetes.io/name: ingress-nginx
575575
app.kubernetes.io/instance: ingress-nginx
576-
app.kubernetes.io/version: 1.0.0-beta.1
576+
app.kubernetes.io/version: 1.0.0-beta.2
577577
app.kubernetes.io/managed-by: Helm
578578
app.kubernetes.io/component: admission-webhook
579579
roleRef:
@@ -595,27 +595,27 @@ metadata:
595595
helm.sh/hook: pre-install,pre-upgrade
596596
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
597597
labels:
598-
helm.sh/chart: ingress-nginx-4.0.0
598+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
599599
app.kubernetes.io/name: ingress-nginx
600600
app.kubernetes.io/instance: ingress-nginx
601-
app.kubernetes.io/version: 1.0.0-beta.1
601+
app.kubernetes.io/version: 1.0.0-beta.2
602602
app.kubernetes.io/managed-by: Helm
603603
app.kubernetes.io/component: admission-webhook
604604
spec:
605605
template:
606606
metadata:
607607
name: ingress-nginx-admission-create
608608
labels:
609-
helm.sh/chart: ingress-nginx-4.0.0
609+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
610610
app.kubernetes.io/name: ingress-nginx
611611
app.kubernetes.io/instance: ingress-nginx
612-
app.kubernetes.io/version: 1.0.0-beta.1
612+
app.kubernetes.io/version: 1.0.0-beta.2
613613
app.kubernetes.io/managed-by: Helm
614614
app.kubernetes.io/component: admission-webhook
615615
spec:
616616
containers:
617617
- name: create
618-
image: docker.io/jettech/kube-webhook-certgen:v1.5.1
618+
image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
619619
imagePullPolicy: IfNotPresent
620620
args:
621621
- create
@@ -645,27 +645,27 @@ metadata:
645645
helm.sh/hook: post-install,post-upgrade
646646
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
647647
labels:
648-
helm.sh/chart: ingress-nginx-4.0.0
648+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
649649
app.kubernetes.io/name: ingress-nginx
650650
app.kubernetes.io/instance: ingress-nginx
651-
app.kubernetes.io/version: 1.0.0-beta.1
651+
app.kubernetes.io/version: 1.0.0-beta.2
652652
app.kubernetes.io/managed-by: Helm
653653
app.kubernetes.io/component: admission-webhook
654654
spec:
655655
template:
656656
metadata:
657657
name: ingress-nginx-admission-patch
658658
labels:
659-
helm.sh/chart: ingress-nginx-4.0.0
659+
helm.sh/chart: ingress-nginx-4.0.0-beta.2
660660
app.kubernetes.io/name: ingress-nginx
661661
app.kubernetes.io/instance: ingress-nginx
662-
app.kubernetes.io/version: 1.0.0-beta.1
662+
app.kubernetes.io/version: 1.0.0-beta.2
663663
app.kubernetes.io/managed-by: Helm
664664
app.kubernetes.io/component: admission-webhook
665665
spec:
666666
containers:
667667
- name: patch
668-
image: docker.io/jettech/kube-webhook-certgen:v1.5.1
668+
image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
669669
imagePullPolicy: IfNotPresent
670670
args:
671671
- patch

0 commit comments

Comments
 (0)