Skip to content

Commit 96fe9aa

Browse files
committed
update manifests in accordance to order of resources
Signed-off-by: Vandit Singh <[email protected]>
1 parent 9a971d5 commit 96fe9aa

File tree

1 file changed

+90
-89
lines changed

1 file changed

+90
-89
lines changed

prombench/manifests/cluster-infra/2_ingress-nginx-controller.yaml

+90-89
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,57 @@ spec:
388388
app.kubernetes.io/name: ingress-nginx
389389
type: ClusterIP
390390
---
391+
apiVersion: batch/v1
392+
kind: Job
393+
metadata:
394+
labels:
395+
app.kubernetes.io/component: admission-webhook
396+
app.kubernetes.io/instance: ingress-nginx
397+
app.kubernetes.io/name: ingress-nginx
398+
app.kubernetes.io/part-of: ingress-nginx
399+
app.kubernetes.io/version: 1.10.1
400+
name: ingress-nginx-admission-create
401+
namespace: ingress-nginx
402+
spec:
403+
template:
404+
metadata:
405+
labels:
406+
app.kubernetes.io/component: admission-webhook
407+
app.kubernetes.io/instance: ingress-nginx
408+
app.kubernetes.io/name: ingress-nginx
409+
app.kubernetes.io/part-of: ingress-nginx
410+
app.kubernetes.io/version: 1.10.1
411+
name: ingress-nginx-admission-create
412+
spec:
413+
containers:
414+
- args:
415+
- create
416+
- --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.$(POD_NAMESPACE).svc
417+
- --namespace=$(POD_NAMESPACE)
418+
- --secret-name=ingress-nginx-admission
419+
env:
420+
- name: POD_NAMESPACE
421+
valueFrom:
422+
fieldRef:
423+
fieldPath: metadata.namespace
424+
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.4.1@sha256:36d05b4077fb8e3d13663702fa337f124675ba8667cbd949c03a8e8ea6fa4366
425+
imagePullPolicy: IfNotPresent
426+
name: create
427+
securityContext:
428+
allowPrivilegeEscalation: false
429+
capabilities:
430+
drop:
431+
- ALL
432+
readOnlyRootFilesystem: true
433+
runAsNonRoot: true
434+
runAsUser: 65532
435+
seccompProfile:
436+
type: RuntimeDefault
437+
nodeSelector:
438+
kubernetes.io/os: linux
439+
restartPolicy: OnFailure
440+
serviceAccountName: ingress-nginx-admission
441+
---
391442
apiVersion: apps/v1
392443
kind: Deployment
393444
metadata:
@@ -515,56 +566,51 @@ spec:
515566
secret:
516567
secretName: ingress-nginx-admission
517568
---
518-
apiVersion: batch/v1
519-
kind: Job
569+
apiVersion: networking.k8s.io/v1
570+
kind: IngressClass
520571
metadata:
521572
labels:
522-
app.kubernetes.io/component: admission-webhook
573+
app.kubernetes.io/component: controller
523574
app.kubernetes.io/instance: ingress-nginx
524575
app.kubernetes.io/name: ingress-nginx
525576
app.kubernetes.io/part-of: ingress-nginx
526577
app.kubernetes.io/version: 1.10.1
527-
name: ingress-nginx-admission-create
528-
namespace: ingress-nginx
578+
name: nginx
529579
spec:
530-
template:
531-
metadata:
532-
labels:
533-
app.kubernetes.io/component: admission-webhook
534-
app.kubernetes.io/instance: ingress-nginx
535-
app.kubernetes.io/name: ingress-nginx
536-
app.kubernetes.io/part-of: ingress-nginx
537-
app.kubernetes.io/version: 1.10.1
538-
name: ingress-nginx-admission-create
539-
spec:
540-
containers:
541-
- args:
542-
- create
543-
- --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.$(POD_NAMESPACE).svc
544-
- --namespace=$(POD_NAMESPACE)
545-
- --secret-name=ingress-nginx-admission
546-
env:
547-
- name: POD_NAMESPACE
548-
valueFrom:
549-
fieldRef:
550-
fieldPath: metadata.namespace
551-
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.4.1@sha256:36d05b4077fb8e3d13663702fa337f124675ba8667cbd949c03a8e8ea6fa4366
552-
imagePullPolicy: IfNotPresent
553-
name: create
554-
securityContext:
555-
allowPrivilegeEscalation: false
556-
capabilities:
557-
drop:
558-
- ALL
559-
readOnlyRootFilesystem: true
560-
runAsNonRoot: true
561-
runAsUser: 65532
562-
seccompProfile:
563-
type: RuntimeDefault
564-
nodeSelector:
565-
kubernetes.io/os: linux
566-
restartPolicy: OnFailure
567-
serviceAccountName: ingress-nginx-admission
580+
controller: k8s.io/ingress-nginx
581+
---
582+
apiVersion: admissionregistration.k8s.io/v1
583+
kind: ValidatingWebhookConfiguration
584+
metadata:
585+
labels:
586+
app.kubernetes.io/component: admission-webhook
587+
app.kubernetes.io/instance: ingress-nginx
588+
app.kubernetes.io/name: ingress-nginx
589+
app.kubernetes.io/part-of: ingress-nginx
590+
app.kubernetes.io/version: 1.10.1
591+
name: ingress-nginx-admission
592+
webhooks:
593+
- admissionReviewVersions:
594+
- v1
595+
clientConfig:
596+
service:
597+
name: ingress-nginx-controller-admission
598+
namespace: ingress-nginx
599+
path: /networking/v1/ingresses
600+
failurePolicy: Fail
601+
matchPolicy: Equivalent
602+
name: validate.nginx.ingress.kubernetes.io
603+
rules:
604+
- apiGroups:
605+
- networking.k8s.io
606+
apiVersions:
607+
- v1
608+
operations:
609+
- CREATE
610+
- UPDATE
611+
resources:
612+
- ingresses
613+
sideEffects: None
568614
---
569615
apiVersion: batch/v1
570616
kind: Job
@@ -618,49 +664,4 @@ spec:
618664
kubernetes.io/os: linux
619665
restartPolicy: OnFailure
620666
serviceAccountName: ingress-nginx-admission
621-
---
622-
apiVersion: networking.k8s.io/v1
623-
kind: IngressClass
624-
metadata:
625-
labels:
626-
app.kubernetes.io/component: controller
627-
app.kubernetes.io/instance: ingress-nginx
628-
app.kubernetes.io/name: ingress-nginx
629-
app.kubernetes.io/part-of: ingress-nginx
630-
app.kubernetes.io/version: 1.10.1
631-
name: nginx
632-
spec:
633-
controller: k8s.io/ingress-nginx
634-
---
635-
apiVersion: admissionregistration.k8s.io/v1
636-
kind: ValidatingWebhookConfiguration
637-
metadata:
638-
labels:
639-
app.kubernetes.io/component: admission-webhook
640-
app.kubernetes.io/instance: ingress-nginx
641-
app.kubernetes.io/name: ingress-nginx
642-
app.kubernetes.io/part-of: ingress-nginx
643-
app.kubernetes.io/version: 1.10.1
644-
name: ingress-nginx-admission
645-
webhooks:
646-
- admissionReviewVersions:
647-
- v1
648-
clientConfig:
649-
service:
650-
name: ingress-nginx-controller-admission
651-
namespace: ingress-nginx
652-
path: /networking/v1/ingresses
653-
failurePolicy: Fail
654-
matchPolicy: Equivalent
655-
name: validate.nginx.ingress.kubernetes.io
656-
rules:
657-
- apiGroups:
658-
- networking.k8s.io
659-
apiVersions:
660-
- v1
661-
operations:
662-
- CREATE
663-
- UPDATE
664-
resources:
665-
- ingresses
666-
sideEffects: None
667+

0 commit comments

Comments
 (0)