diff --git a/test/manifests/ingress-controller/mandatory.yaml b/test/manifests/ingress-controller/mandatory.yaml index 3c84ba722..c960bb0ff 100644 --- a/test/manifests/ingress-controller/mandatory.yaml +++ b/test/manifests/ingress-controller/mandatory.yaml @@ -1,5 +1,3 @@ ---- - kind: ConfigMap apiVersion: v1 metadata: @@ -8,7 +6,6 @@ metadata: app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx --- - kind: ConfigMap apiVersion: v1 metadata: @@ -17,7 +14,6 @@ metadata: app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx --- - kind: ConfigMap apiVersion: v1 metadata: @@ -26,7 +22,6 @@ metadata: app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx --- - apiVersion: v1 kind: ServiceAccount metadata: @@ -35,7 +30,6 @@ metadata: app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx --- - apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: @@ -80,10 +74,10 @@ rules: - apiGroups: - "" resources: - - events + - events verbs: - - create - - patch + - create + - patch - apiGroups: - "extensions" resources: @@ -92,7 +86,6 @@ rules: - update --- - apiVersion: rbac.authorization.k8s.io/v1beta1 kind: Role metadata: @@ -137,7 +130,6 @@ rules: - get --- - apiVersion: rbac.authorization.k8s.io/v1beta1 kind: RoleBinding metadata: @@ -155,7 +147,6 @@ subjects: namespace: ${NAMESPACE} --- - apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: @@ -171,9 +162,8 @@ subjects: - kind: ServiceAccount name: nginx-ingress-serviceaccount namespace: ${NAMESPACE} - ---- +--- apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -193,39 +183,37 @@ spec: app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx annotations: - prometheus.io/port: '10254' - prometheus.io/scrape: 'true' + prometheus.io/port: "10254" + prometheus.io/scrape: "true" spec: terminationGracePeriodSeconds: 0 serviceAccountName: nginx-ingress-serviceaccount initContainers: - - name: enable-coredump - image: busybox - command: - - /bin/sh - - -c - - | - ulimit -c unlimited - echo "/tmp/core.%e.%p" > /proc/sys/kernel/core_pattern - sysctl -w fs.suid_dumpable=2 - securityContext: - privileged: true + - name: enable-coredump + image: busybox + command: + - /bin/sh + - -c + - | + ulimit -c unlimited + echo "/tmp/core.%e.%p" > /proc/sys/kernel/core_pattern + sysctl -w fs.suid_dumpable=2 + securityContext: + privileged: true containers: - name: nginx-ingress-controller image: ingress-controller/nginx-ingress-controller:dev args: - /nginx-ingress-controller - --configmap=$(POD_NAMESPACE)/nginx-configuration - - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services - - --udp-services-configmap=$(POD_NAMESPACE)/udp-services - --publish-service=$(POD_NAMESPACE)/ingress-nginx - --annotations-prefix=nginx.ingress.kubernetes.io - --watch-namespace=${NAMESPACE} securityContext: capabilities: - drop: + drop: - ALL - add: + add: - NET_BIND_SERVICE # www-data -> 33 runAsUser: 33 @@ -239,10 +227,10 @@ spec: fieldRef: fieldPath: metadata.namespace ports: - - name: http - containerPort: 80 - - name: https - containerPort: 443 + - name: http + containerPort: 80 + - name: https + containerPort: 443 livenessProbe: failureThreshold: 3 httpGet: