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.

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

Update nginx-ingress with edits made in Replicated Ship Cloud #82

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open
40 changes: 24 additions & 16 deletions nginx-ingress/nginx-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ rules:
- watch
- apiGroups:
- extensions
- networking.k8s.io
resources:
- ingresses
verbs:
Expand All @@ -50,6 +51,7 @@ rules:
- watch
- apiGroups:
- extensions
- networking.k8s.io
resources:
- ingresses/status
verbs:
Expand Down Expand Up @@ -121,6 +123,7 @@ rules:
- watch
- apiGroups:
- extensions
- networking.k8s.io
resources:
- ingresses
verbs:
Expand All @@ -136,6 +139,7 @@ rules:
- patch
- apiGroups:
- extensions
- networking.k8s.io
resources:
- ingresses/status
verbs:
Expand Down Expand Up @@ -174,17 +178,6 @@ subjects:
namespace: default
---
apiVersion: v1
data:
enable-vts-status: "false"
kind: ConfigMap
metadata:
labels:
app: nginx-ingress
component: controller
release: nginx-ingress
name: nginx-ingress-controller
---
apiVersion: v1
kind: Service
metadata:
labels:
Expand Down Expand Up @@ -240,7 +233,7 @@ metadata:
name: nginx-ingress-controller
spec:
minReadySeconds: 0
replicas: 3
replicas: 1
revisionHistoryLimit: 10
strategy: {}
template:
Expand All @@ -266,10 +259,10 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.24.1
image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.25.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 10
failureThreshold: 3
httpGet:
path: /healthz
port: 10254
Expand Down Expand Up @@ -298,6 +291,7 @@ spec:
timeoutSeconds: 1
resources: {}
securityContext:
allowPrivilegeEscalation: true
capabilities:
add:
- NET_BIND_SERVICE
Expand Down Expand Up @@ -329,20 +323,34 @@ spec:
spec:
containers:
- args: []
image: k8s.gcr.io/defaultbackend:1.4
image: k8s.gcr.io/defaultbackend-amd64:1.5
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
httpGet:
path: /healthz
port: 8080
scheme: HTTP
initialDelaySeconds: 30
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 5
name: nginx-ingress-default-backend
ports:
- containerPort: 8080
name: http
protocol: TCP
readinessProbe:
failureThreshold: 6
httpGet:
path: /healthz
port: 8080
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 5
successThreshold: 1
timeoutSeconds: 5
resources: {}
serviceAccountName: nginx-ingress
securityContext:
runAsUser: 65534
terminationGracePeriodSeconds: 60