Skip to content

Commit

Permalink
salt: deploy nginx-ingress-control-plane addon
Browse files Browse the repository at this point in the history
This provisions an ingress controller for the `nginx-control-plane`
class, which will run on all `master` nodes, and be exposed on port 8443
off the control-plane IP address of the `bootstrap` node. We can add
addresses of other `master` nodes later.

The `chart.sls` file was generated using

```
./charts/render.py nginx-ingress-control-plane metalk8s-ingress charts/nginx-ingress-control-plane.yaml charts/nginx-ingress/ > salt/metalk8s/addons/nginx-ingress-control-plane/deployed/chart.sls
```

Fixes: #1796
See: #1796
See: #1800
  • Loading branch information
NicolasT committed Sep 30, 2019
1 parent eecfb18 commit e67ed64
Show file tree
Hide file tree
Showing 5 changed files with 393 additions and 0 deletions.
3 changes: 3 additions & 0 deletions buildchain/buildchain/salt_tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,9 @@ def _get_parts(self) -> Iterator[str]:
Path('salt/metalk8s/addons/nginx-ingress/deployed/chart.sls'),
Path('salt/metalk8s/addons/nginx-ingress/deployed/namespace.sls'),

Path('salt/metalk8s/addons/nginx-ingress-control-plane/deployed/init.sls'),
Path('salt/metalk8s/addons/nginx-ingress-control-plane/deployed/chart.sls'),

Path('salt/metalk8s/container-engine/containerd/configured.sls'),
Path('salt/metalk8s/container-engine/containerd/files/50-metalk8s.conf'),
Path('salt/metalk8s/container-engine/containerd/init.sls'),
Expand Down
42 changes: 42 additions & 0 deletions charts/nginx-ingress-control-plane.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
controller:
image:
repository: '{%- endraw -%}{{ build_image_name("nginx-ingress-controller", False) }}{%- raw -%}'

defaultBackendService: 'metalk8s-ingress/nginx-ingress-default-backend'

electionID: ingress-control-plane-controller-leader

ingressClass: nginx-control-plane

kind: DaemonSet

updateStrategy:
type: RollingUpdate

tolerations:
- key: "node-role.kubernetes.io/bootstrap"
operator: "Exists"
effect: "NoSchedule"
- key: "node-role.kubernetes.io/master"
operator: "Exists"
effect: "NoSchedule"
- key: "node-role.kubernetes.io/infra"
operator: "Exists"
effect: "NoSchedule"

nodeSelector:
node-role.kubernetes.io/master: ''

service:
type: ClusterIP

externalIPs:
- '{%- endraw -%}{{ grains.metalk8s.control_plane_ip }}{%- raw -%}'

enableHttp: false

ports:
https: 8443

defaultBackend:
enabled: false
344 changes: 344 additions & 0 deletions salt/metalk8s/addons/nginx-ingress-control-plane/deployed/chart.sls
Original file line number Diff line number Diff line change
@@ -0,0 +1,344 @@
#!jinja | kubernetes kubeconfig=/etc/kubernetes/admin.conf&context=kubernetes-admin@kubernetes
{%- from "metalk8s/repo/macro.sls" import build_image_name with context %}
{% raw %}
apiVersion: v1
kind: ServiceAccount
metadata:
labels:
app: nginx-ingress
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: nginx-ingress
app.kubernetes.io/part-of: metalk8s
chart: nginx-ingress-1.10.2
heritage: metalk8s
release: nginx-ingress-control-plane
name: nginx-ingress-control-plane
namespace: metalk8s-ingress
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRole
metadata:
labels:
app: nginx-ingress
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: nginx-ingress
app.kubernetes.io/part-of: metalk8s
chart: nginx-ingress-1.10.2
heritage: metalk8s
release: nginx-ingress-control-plane
name: nginx-ingress-control-plane
namespace: metalk8s-ingress
rules:
- apiGroups:
- ''
resources:
- configmaps
- endpoints
- nodes
- pods
- secrets
verbs:
- list
- watch
- apiGroups:
- ''
resources:
- nodes
verbs:
- get
- apiGroups:
- ''
resources:
- services
verbs:
- get
- list
- update
- watch
- apiGroups:
- extensions
- networking.k8s.io
resources:
- ingresses
verbs:
- get
- list
- watch
- apiGroups:
- ''
resources:
- events
verbs:
- create
- patch
- apiGroups:
- extensions
- networking.k8s.io
resources:
- ingresses/status
verbs:
- update
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
metadata:
labels:
app: nginx-ingress
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: nginx-ingress
app.kubernetes.io/part-of: metalk8s
chart: nginx-ingress-1.10.2
heritage: metalk8s
release: nginx-ingress-control-plane
name: nginx-ingress-control-plane
namespace: metalk8s-ingress
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: nginx-ingress-control-plane
subjects:
- kind: ServiceAccount
name: nginx-ingress-control-plane
namespace: metalk8s-ingress
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: Role
metadata:
labels:
app: nginx-ingress
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: nginx-ingress
app.kubernetes.io/part-of: metalk8s
chart: nginx-ingress-1.10.2
heritage: metalk8s
release: nginx-ingress-control-plane
name: nginx-ingress-control-plane
namespace: metalk8s-ingress
rules:
- apiGroups:
- ''
resources:
- namespaces
verbs:
- get
- apiGroups:
- ''
resources:
- configmaps
- pods
- secrets
- endpoints
verbs:
- get
- list
- watch
- apiGroups:
- ''
resources:
- services
verbs:
- get
- list
- update
- watch
- apiGroups:
- extensions
- networking.k8s.io
resources:
- ingresses
verbs:
- get
- list
- watch
- apiGroups:
- extensions
- networking.k8s.io
resources:
- ingresses/status
verbs:
- update
- apiGroups:
- ''
resourceNames:
- ingress-control-plane-controller-leader-nginx-control-plane
resources:
- configmaps
verbs:
- get
- update
- apiGroups:
- ''
resources:
- configmaps
verbs:
- create
- apiGroups:
- ''
resources:
- endpoints
verbs:
- create
- get
- update
- apiGroups:
- ''
resources:
- events
verbs:
- create
- patch
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: RoleBinding
metadata:
labels:
app: nginx-ingress
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: nginx-ingress
app.kubernetes.io/part-of: metalk8s
chart: nginx-ingress-1.10.2
heritage: metalk8s
release: nginx-ingress-control-plane
name: nginx-ingress-control-plane
namespace: metalk8s-ingress
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: nginx-ingress-control-plane
subjects:
- kind: ServiceAccount
name: nginx-ingress-control-plane
namespace: metalk8s-ingress
---
apiVersion: v1
kind: Service
metadata:
labels:
app: nginx-ingress
app.kubernetes.io/component: controller
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: nginx-ingress
app.kubernetes.io/part-of: metalk8s
chart: nginx-ingress-1.10.2
component: controller
heritage: metalk8s
release: nginx-ingress-control-plane
name: nginx-ingress-control-plane-controller
namespace: metalk8s-ingress
spec:
clusterIP: ''
externalIPs:
- '{%- endraw -%}{{ grains.metalk8s.control_plane_ip }}{%- raw -%}'
ports:
- name: https
port: 8443
protocol: TCP
targetPort: https
selector:
app: nginx-ingress
component: controller
release: nginx-ingress-control-plane
type: ClusterIP
---
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
labels:
app: nginx-ingress
app.kubernetes.io/component: controller
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: nginx-ingress
app.kubernetes.io/part-of: metalk8s
chart: nginx-ingress-1.10.2
component: controller
heritage: metalk8s
release: nginx-ingress-control-plane
name: nginx-ingress-control-plane-controller
namespace: metalk8s-ingress
spec:
minReadySeconds: 0
revisionHistoryLimit: 10
template:
metadata:
labels:
app: nginx-ingress
component: controller
release: nginx-ingress-control-plane
spec:
containers:
- args:
- /nginx-ingress-controller
- --default-backend-service=metalk8s-ingress/nginx-ingress-default-backend
- --election-id=ingress-control-plane-controller-leader
- --ingress-class=nginx-control-plane
- --configmap=metalk8s-ingress/nginx-ingress-control-plane-controller
env:
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: POD_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: '{%- endraw -%}{{ build_image_name("nginx-ingress-controller", False)
}}{%- raw -%}:0.25.0'
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
httpGet:
path: /healthz
port: 10254
scheme: HTTP
initialDelaySeconds: 10
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 1
name: nginx-ingress-controller
ports:
- containerPort: 80
name: http
protocol: TCP
- containerPort: 443
name: https
protocol: TCP
readinessProbe:
failureThreshold: 3
httpGet:
path: /healthz
port: 10254
scheme: HTTP
initialDelaySeconds: 10
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 1
resources: {}
securityContext:
capabilities:
add:
- NET_BIND_SERVICE
drop:
- ALL
runAsUser: 33
dnsPolicy: ClusterFirst
hostNetwork: false
nodeSelector:
node-role.kubernetes.io/master: ''
serviceAccountName: nginx-ingress-control-plane
terminationGracePeriodSeconds: 60
tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/bootstrap
operator: Exists
- effect: NoSchedule
key: node-role.kubernetes.io/master
operator: Exists
- effect: NoSchedule
key: node-role.kubernetes.io/infra
operator: Exists
updateStrategy:
type: RollingUpdate
{% endraw %}
Loading

0 comments on commit e67ed64

Please sign in to comment.