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

feat (in-cluster infra): [upgrade oss] bump nginx to 1.5.1 #77

Merged
merged 4 commits into from
Mar 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
124 changes: 93 additions & 31 deletions cluster-manifests/ingress-nginx/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Source: https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.6.4/deploy/static/provider/cloud/deploy.yaml
apiVersion: v1
automountServiceAccountToken: true
kind: ServiceAccount
Expand All @@ -6,6 +7,8 @@ metadata:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: controller
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
name: ingress-nginx
namespace: ingress-nginx
---
Expand All @@ -16,6 +19,8 @@ metadata:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: controller
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
name: ingress-nginx-controller
namespace: ingress-nginx
data:
Expand All @@ -32,10 +37,12 @@ metadata:
labels:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
name: ingress-nginx
rules:
- apiGroups:
- ""
- ""
resources:
- configmaps
- endpoints
Expand All @@ -47,13 +54,20 @@ rules:
- list
- watch
- apiGroups:
- ""
- coordination.k8s.io
resources:
- leases
verbs:
- list
- watch
- apiGroups:
- ""
resources:
- nodes
verbs:
- get
- apiGroups:
- ""
- ""
resources:
- services
verbs:
Expand All @@ -69,7 +83,7 @@ rules:
- list
- watch
- apiGroups:
- ""
- ""
resources:
- events
verbs:
Expand All @@ -89,13 +103,23 @@ rules:
- get
- list
- watch
- apiGroups:
- discovery.k8s.io
resources:
- endpointslices
verbs:
- list
- watch
- get
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -113,17 +137,19 @@ metadata:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: controller
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
name: ingress-nginx
namespace: ingress-nginx
rules:
- apiGroups:
- ""
- ""
resources:
- namespaces
verbs:
- get
- apiGroups:
- ""
- ""
resources:
- configmaps
- pods
Expand All @@ -134,7 +160,7 @@ rules:
- list
- watch
- apiGroups:
- ""
- ""
resources:
- services
verbs:
Expand Down Expand Up @@ -164,27 +190,35 @@ rules:
- list
- watch
- apiGroups:
- ""
resources:
- configmaps
- coordination.k8s.io
resourceNames:
- ingress-controller-leader
- ingress-nginx-leader
resources:
- leases
verbs:
- get
- update
- apiGroups:
- ""
- coordination.k8s.io
resources:
- configmaps
- leases
verbs:
- create
- apiGroups:
- ""
- ""
resources:
- events
verbs:
- create
- patch
- apiGroups:
- discovery.k8s.io
resources:
- endpointslices
verbs:
- list
- watch
- get
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
Expand All @@ -193,6 +227,8 @@ metadata:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: controller
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
name: ingress-nginx
namespace: ingress-nginx
roleRef:
Expand All @@ -211,6 +247,8 @@ metadata:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: controller
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
Expand All @@ -229,9 +267,11 @@ apiVersion: v1
kind: Service
metadata:
labels:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: controller
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
name: ingress-nginx-controller
namespace: ingress-nginx
annotations:
Expand Down Expand Up @@ -262,7 +302,8 @@ metadata:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: controller
aadpodidbinding: podmi-ingress-controller
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
pci-scope: out-of-scope
name: ingress-nginx-controller
namespace: ingress-nginx
Expand All @@ -285,13 +326,12 @@ spec:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: controller
aadpodidbinding: podmi-ingress-controller
pci-scope: out-of-scope
spec:
dnsPolicy: ClusterFirst
containers:
- name: controller
image: YOUR_ACR.azurecr.io/live/ingress-nginx/controller:v1.1.2
image: YOUR_ACR.azurecr.io/live/ingress-nginx/controller:v1.6.4
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
Expand Down Expand Up @@ -396,6 +436,8 @@ metadata:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: controller
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
name: nginx
spec:
controller: k8s.io/ingress-nginx
Expand All @@ -407,6 +449,8 @@ metadata:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: admission-webhook
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
name: ingress-nginx-admission
webhooks:
- name: validate.nginx.ingress.kubernetes.io
Expand All @@ -424,7 +468,7 @@ webhooks:
failurePolicy: Fail
sideEffects: None
admissionReviewVersions:
- v1
- v1
clientConfig:
service:
namespace: ingress-nginx
Expand All @@ -439,6 +483,8 @@ metadata:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: admission-webhook
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
namespace: ingress-nginx
---
apiVersion: rbac.authorization.k8s.io/v1
Expand All @@ -449,14 +495,16 @@ metadata:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: admission-webhook
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
rules:
- apiGroups:
- admissionregistration.k8s.io
resources:
- validatingwebhookconfigurations
verbs:
- get
- update
- apiGroups:
- admissionregistration.k8s.io
resources:
- validatingwebhookconfigurations
verbs:
- get
- update
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
Expand All @@ -466,6 +514,8 @@ metadata:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: admission-webhook
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -483,10 +533,12 @@ metadata:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: admission-webhook
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
namespace: ingress-nginx
rules:
- apiGroups:
- ""
- ""
resources:
- secrets
verbs:
Expand All @@ -501,6 +553,8 @@ metadata:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: admission-webhook
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
namespace: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -519,6 +573,8 @@ metadata:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: admission-webhook
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
pci-scope: out-of-scope
namespace: ingress-nginx
spec:
Expand All @@ -529,11 +585,13 @@ spec:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: admission-webhook
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
pci-scope: out-of-scope
spec:
containers:
- name: create
image: YOUR_ACR.azurecr.io/live/jettech/kube-webhook-certgen:v1.1.1
- name: create
image: YOUR_ACR.azurecr.io/live/jettech/kube-webhook-certgen:v20220916-gd32f8c343
imagePullPolicy: IfNotPresent
args:
- create
Expand Down Expand Up @@ -572,6 +630,8 @@ metadata:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: admission-webhook
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
pci-scope: out-of-scope
namespace: ingress-nginx
spec:
Expand All @@ -582,11 +642,13 @@ spec:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: admission-webhook
app.kubernetes.io/part-of: ingress-nginx
app.kubernetes.io/version: 1.6.4
pci-scope: out-of-scope
spec:
containers:
- name: patch
image: YOUR_ACR.azurecr.io/live/jettech/kube-webhook-certgen:v1.1.1
image: YOUR_ACR.azurecr.io/live/jettech/kube-webhook-certgen:v20220916-gd32f8c343
imagePullPolicy: IfNotPresent
args:
- patch
Expand Down Expand Up @@ -617,4 +679,4 @@ spec:
securityContext:
runAsNonRoot: true
runAsUser: 2000
fsGroup: 2000
fsGroup: 2000
Loading