Fixup #2970: Add Missing Label app.kubernetes.io/part-of: ingress-nginx
- Add missing label `app.kubernetes.io/part-of: ingress-nginx` for deploy example - Update new labels for docs/deploy and docs/examples - Update new labels for test/e2e and test/manifests - Update new labels for images/nginx Also close #3001
This commit is contained in:
parent
e60cbc4804
commit
6d3e9ea7d0
22 changed files with 131 additions and 53 deletions
|
|
@ -4,7 +4,8 @@ metadata:
|
|||
name: nginx-configuration
|
||||
namespace: ingress-nginx
|
||||
labels:
|
||||
app: ingress-nginx
|
||||
app.kubernetes.io/name: ingress-nginx
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
data:
|
||||
proxy-connect-timeout: "10"
|
||||
proxy-read-timeout: "120"
|
||||
|
|
|
|||
|
|
@ -4,10 +4,12 @@ kind: Service
|
|||
metadata:
|
||||
name: nginx-errors
|
||||
labels:
|
||||
app: nginx-errors
|
||||
app.kubernetes.io/name: nginx-errors
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
spec:
|
||||
selector:
|
||||
app: nginx-errors
|
||||
app.kubernetes.io/name: nginx-errors
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
ports:
|
||||
- port: 80
|
||||
targetPort: 8080
|
||||
|
|
@ -18,15 +20,20 @@ kind: Deployment
|
|||
apiVersion: apps/v1beta2
|
||||
metadata:
|
||||
name: nginx-errors
|
||||
labels:
|
||||
app.kubernetes.io/name: nginx-errors
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: nginx-errors
|
||||
app.kubernetes.io/name: nginx-errors
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: nginx-errors
|
||||
app.kubernetes.io/name: nginx-errors
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
spec:
|
||||
containers:
|
||||
- name: nginx-error-server
|
||||
|
|
|
|||
|
|
@ -6,4 +6,5 @@ metadata:
|
|||
name: nginx-configuration
|
||||
namespace: ingress-nginx
|
||||
labels:
|
||||
app: ingress-nginx
|
||||
app.kubernetes.io/name: ingress-nginx
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@ metadata:
|
|||
name: nginx-configuration
|
||||
namespace: ingress-nginx
|
||||
labels:
|
||||
app: ingress-nginx
|
||||
app.kubernetes.io/name: ingress-nginx
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
```
|
||||
|
||||
```console
|
||||
|
|
@ -40,7 +41,8 @@ metadata:
|
|||
name: nginx-configuration
|
||||
namespace: ingress-nginx
|
||||
labels:
|
||||
app: ingress-nginx
|
||||
app.kubernetes.io/name: ingress-nginx
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
```
|
||||
|
||||
```console
|
||||
|
|
|
|||
|
|
@ -6,4 +6,5 @@ metadata:
|
|||
name: nginx-configuration
|
||||
namespace: ingress-nginx
|
||||
labels:
|
||||
app: ingress-nginx
|
||||
app.kubernetes.io/name: ingress-nginx
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@ kind: Service
|
|||
metadata:
|
||||
name: nginx
|
||||
labels:
|
||||
app: nginx
|
||||
app.kubernetes.io/name: ingress-nginx
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
spec:
|
||||
ports:
|
||||
- port: 80
|
||||
|
|
@ -11,18 +12,23 @@ spec:
|
|||
protocol: TCP
|
||||
name: http
|
||||
selector:
|
||||
app: nginx
|
||||
app.kubernetes.io/name: ingress-nginx
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: ReplicationController
|
||||
metadata:
|
||||
name: nginx
|
||||
labels:
|
||||
app.kubernetes.io/name: ingress-nginx
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
spec:
|
||||
replicas: 1
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: nginx
|
||||
app.kubernetes.io/name: ingress-nginx
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
spec:
|
||||
containers:
|
||||
- name: nginx
|
||||
|
|
@ -35,7 +41,8 @@ kind: Service
|
|||
metadata:
|
||||
name: http-svc
|
||||
labels:
|
||||
app: http-svc
|
||||
app.kubernetes.io/name: http-svc
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
spec:
|
||||
ports:
|
||||
- port: 80
|
||||
|
|
@ -43,18 +50,23 @@ spec:
|
|||
protocol: TCP
|
||||
name: http
|
||||
selector:
|
||||
app: http-svc
|
||||
app.kubernetes.io/name: http-svc
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: ReplicationController
|
||||
metadata:
|
||||
name: http-svc
|
||||
labels:
|
||||
app.kubernetes.io/name: http-svc
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
spec:
|
||||
replicas: 1
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: http-svc
|
||||
app.kubernetes.io/name: http-svc
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
spec:
|
||||
containers:
|
||||
- name: http-svc
|
||||
|
|
@ -113,4 +125,4 @@ spec:
|
|||
- backend:
|
||||
serviceName: nginx
|
||||
servicePort: 80
|
||||
path: /
|
||||
path: /
|
||||
|
|
|
|||
|
|
@ -3,16 +3,19 @@ kind: Deployment
|
|||
metadata:
|
||||
name: nginx-ingress-controller
|
||||
labels:
|
||||
k8s-app: nginx-ingress-controller
|
||||
app.kubernetes.io/name: ingress-nginx
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
k8s-app: nginx-ingress-controller
|
||||
app.kubernetes.io/name: ingress-nginx
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
k8s-app: nginx-ingress-controller
|
||||
app.kubernetes.io/name: ingress-nginx
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
spec:
|
||||
# hostNetwork makes it possible to use ipv6 and to preserve the source IP correctly regardless of docker configuration
|
||||
# however, it is not a hard dependency of the nginx-ingress-controller itself and it may cause issues if port 10254 already is taken on the host
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@ kind: Service
|
|||
metadata:
|
||||
name: nginx-ingress-lb
|
||||
labels:
|
||||
app: nginx-ingress-lb
|
||||
app.kubernetes.io/name: ingress-nginx
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
spec:
|
||||
externalTrafficPolicy: Local
|
||||
type: LoadBalancer
|
||||
|
|
@ -18,5 +19,5 @@ spec:
|
|||
targetPort: 443
|
||||
selector:
|
||||
# Selects nginx-ingress-controller pods
|
||||
k8s-app: nginx-ingress-controller
|
||||
|
||||
app.kubernetes.io/name: ingress-nginx
|
||||
app.kubernetes.io/part-of: ingress-nginx
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue