Skip to content
This repository was archived by the owner on Mar 24, 2023. It is now read-only.

Commit d7756a3

Browse files
authored
Merge pull request #811 from laverya/allow-vendor-kustomize-overlays
Allow vendor-supplied kustomize overlays
2 parents 0a1f753 + da2a906 commit d7756a3

25 files changed

+896
-13
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"v1": {
3+
"config": {},
4+
"releaseName": "ship",
5+
"upstream": "__upstream__",
6+
"contentSHA": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
7+
}
8+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
apiVersion: rbac.authorization.k8s.io/v1beta1
2+
kind: ClusterRole
3+
metadata:
4+
labels:
5+
app.kubernetes.io/name: ingress-nginx
6+
app.kubernetes.io/part-of: ingress-nginx
7+
name: nginx-ingress-clusterrole
8+
rules:
9+
- apiGroups:
10+
- ""
11+
resources:
12+
- configmaps
13+
- endpoints
14+
- nodes
15+
- pods
16+
- secrets
17+
verbs:
18+
- list
19+
- watch
20+
- apiGroups:
21+
- ""
22+
resources:
23+
- nodes
24+
verbs:
25+
- get
26+
- apiGroups:
27+
- ""
28+
resources:
29+
- services
30+
verbs:
31+
- get
32+
- list
33+
- watch
34+
- apiGroups:
35+
- extensions
36+
resources:
37+
- ingresses
38+
verbs:
39+
- get
40+
- list
41+
- watch
42+
- apiGroups:
43+
- ""
44+
resources:
45+
- events
46+
verbs:
47+
- create
48+
- patch
49+
- apiGroups:
50+
- extensions
51+
resources:
52+
- ingresses/status
53+
verbs:
54+
- update
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
apiVersion: rbac.authorization.k8s.io/v1beta1
2+
kind: ClusterRoleBinding
3+
metadata:
4+
labels:
5+
app.kubernetes.io/name: ingress-nginx
6+
app.kubernetes.io/part-of: ingress-nginx
7+
name: nginx-ingress-clusterrole-nisa-binding
8+
roleRef:
9+
apiGroup: rbac.authorization.k8s.io
10+
kind: ClusterRole
11+
name: nginx-ingress-clusterrole
12+
subjects:
13+
- kind: ServiceAccount
14+
name: nginx-ingress-serviceaccount
15+
namespace: ingress-nginx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
apiVersion: v1
2+
data:
3+
use-proxy-protocol: "true"
4+
kind: ConfigMap
5+
metadata:
6+
labels:
7+
app.kubernetes.io/name: ingress-nginx
8+
app.kubernetes.io/part-of: ingress-nginx
9+
name: nginx-configuration
10+
namespace: ingress-nginx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
labels:
5+
app.kubernetes.io/name: ingress-nginx
6+
app.kubernetes.io/part-of: ingress-nginx
7+
name: tcp-services
8+
namespace: ingress-nginx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
labels:
5+
app.kubernetes.io/name: ingress-nginx
6+
app.kubernetes.io/part-of: ingress-nginx
7+
name: udp-services
8+
namespace: ingress-nginx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
labels:
5+
app.kubernetes.io/name: ingress-nginx
6+
app.kubernetes.io/part-of: ingress-nginx
7+
name: nginx-ingress-controller
8+
namespace: ingress-nginx
9+
spec:
10+
replicas: 1
11+
selector:
12+
matchLabels:
13+
app.kubernetes.io/name: ingress-nginx
14+
app.kubernetes.io/part-of: ingress-nginx
15+
template:
16+
metadata:
17+
annotations:
18+
prometheus.io/port: "10254"
19+
prometheus.io/scrape: "true"
20+
labels:
21+
app.kubernetes.io/name: ingress-nginx
22+
app.kubernetes.io/part-of: ingress-nginx
23+
spec:
24+
containers:
25+
- args:
26+
- /nginx-ingress-controller
27+
- --configmap=$(POD_NAMESPACE)/nginx-configuration
28+
- --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
29+
- --udp-services-configmap=$(POD_NAMESPACE)/udp-services
30+
- --publish-service=$(POD_NAMESPACE)/ingress-nginx
31+
- --annotations-prefix=nginx.ingress.kubernetes.io
32+
env:
33+
- name: POD_NAME
34+
valueFrom:
35+
fieldRef:
36+
fieldPath: metadata.name
37+
- name: POD_NAMESPACE
38+
valueFrom:
39+
fieldRef:
40+
fieldPath: metadata.namespace
41+
image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.22.0
42+
livenessProbe:
43+
failureThreshold: 3
44+
httpGet:
45+
path: /healthz
46+
port: 10254
47+
scheme: HTTP
48+
initialDelaySeconds: 10
49+
periodSeconds: 10
50+
successThreshold: 1
51+
timeoutSeconds: 1
52+
name: nginx-ingress-controller
53+
ports:
54+
- containerPort: 80
55+
name: http
56+
- containerPort: 443
57+
name: https
58+
readinessProbe:
59+
failureThreshold: 3
60+
httpGet:
61+
path: /healthz
62+
port: 10254
63+
scheme: HTTP
64+
periodSeconds: 10
65+
successThreshold: 1
66+
timeoutSeconds: 1
67+
securityContext:
68+
allowPrivilegeEscalation: true
69+
capabilities:
70+
add:
71+
- NET_BIND_SERVICE
72+
drop:
73+
- ALL
74+
runAsUser: 33
75+
serviceAccountName: nginx-ingress-serviceaccount
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: v1
2+
kind: Namespace
3+
metadata:
4+
labels:
5+
app.kubernetes.io/name: ingress-nginx
6+
app.kubernetes.io/part-of: ingress-nginx
7+
name: ingress-nginx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
apiVersion: rbac.authorization.k8s.io/v1beta1
2+
kind: Role
3+
metadata:
4+
labels:
5+
app.kubernetes.io/name: ingress-nginx
6+
app.kubernetes.io/part-of: ingress-nginx
7+
name: nginx-ingress-role
8+
namespace: ingress-nginx
9+
rules:
10+
- apiGroups:
11+
- ""
12+
resources:
13+
- configmaps
14+
- pods
15+
- secrets
16+
- namespaces
17+
verbs:
18+
- get
19+
- apiGroups:
20+
- ""
21+
resourceNames:
22+
- ingress-controller-leader-nginx
23+
resources:
24+
- configmaps
25+
verbs:
26+
- get
27+
- update
28+
- apiGroups:
29+
- ""
30+
resources:
31+
- configmaps
32+
verbs:
33+
- create
34+
- apiGroups:
35+
- ""
36+
resources:
37+
- endpoints
38+
verbs:
39+
- get
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: rbac.authorization.k8s.io/v1beta1
2+
kind: RoleBinding
3+
metadata:
4+
labels:
5+
app.kubernetes.io/name: ingress-nginx
6+
app.kubernetes.io/part-of: ingress-nginx
7+
name: nginx-ingress-role-nisa-binding
8+
namespace: ingress-nginx
9+
roleRef:
10+
apiGroup: rbac.authorization.k8s.io
11+
kind: Role
12+
name: nginx-ingress-role
13+
subjects:
14+
- kind: ServiceAccount
15+
name: nginx-ingress-serviceaccount
16+
namespace: ingress-nginx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
apiVersion: v1
2+
kind: ServiceAccount
3+
metadata:
4+
labels:
5+
app.kubernetes.io/name: ingress-nginx
6+
app.kubernetes.io/part-of: ingress-nginx
7+
name: nginx-ingress-serviceaccount
8+
namespace: ingress-nginx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
kind: ""
2+
apiversion: ""
3+
resources:
4+
- common/ClusterRole-nginx-ingress-clusterrole.yaml
5+
- common/ClusterRoleBinding-nginx-ingress-clusterrole-nisa-binding.yaml
6+
- common/ConfigMap-nginx-configuration-ingress-nginx.yaml
7+
- common/ConfigMap-tcp-services-ingress-nginx.yaml
8+
- common/ConfigMap-udp-services-ingress-nginx.yaml
9+
- common/Deployment-nginx-ingress-controller-ingress-nginx.yaml
10+
- common/Namespace-ingress-nginx.yaml
11+
- common/Role-nginx-ingress-role-ingress-nginx.yaml
12+
- common/RoleBinding-nginx-ingress-role-nisa-binding-ingress-nginx.yaml
13+
- common/ServiceAccount-nginx-ingress-serviceaccount-ingress-nginx.yaml
14+
- service-l4.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
annotations:
5+
service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "60"
6+
service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: '*'
7+
labels:
8+
app.kubernetes.io/name: ingress-nginx
9+
app.kubernetes.io/part-of: ingress-nginx
10+
name: ingress-nginx
11+
namespace: ingress-nginx
12+
spec:
13+
ports:
14+
- name: http
15+
port: 80
16+
targetPort: http
17+
- name: https
18+
port: 443
19+
targetPort: https
20+
selector:
21+
app.kubernetes.io/name: ingress-nginx
22+
app.kubernetes.io/part-of: ingress-nginx
23+
type: LoadBalancer
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a workaround for the fact that ship always creates the installer directory

0 commit comments

Comments
 (0)