-
Notifications
You must be signed in to change notification settings - Fork 45
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chart,salt,tests,docs: Add
metallb
deployment in MetalK8s deployment
As part of MetalK8s we will use metallb for control plane ingress if this one is enabled in the Bootstrap Config Chart get rendered with this command: ``` ./charts/render.py metallb --namespace metalk8s-loadbalancing \ charts/metallb.yaml charts/metallb/ \ > salt/metalk8s/addons/metallb/deployed/chart.sls ``` NOTE: When we use metallb we do not need to use Nginx Ingress as a DaemonSet, instead we use a Deployment Nginx Ingress Control Plane deployment get rendered with this command: ``` ./charts/render.py ingress-nginx-control-plane --namespace metalk8s-ingress \ charts/ingress-nginx-control-plane-deployment.yaml charts/ingress-nginx/ \ > salt/metalk8s/addons/nginx-ingress-control-plane/deployed/chart-deployment.sls ``` Fixes: #2381
- Loading branch information
1 parent
235f974
commit 69344bc
Showing
25 changed files
with
1,569 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
controller: | ||
image: | ||
digest: null | ||
repository: '__image__(nginx-ingress-controller)' | ||
|
||
defaultBackendService: 'metalk8s-ingress/nginx-ingress-default-backend' | ||
|
||
electionID: ingress-control-plane-controller-leader | ||
|
||
ingressClass: nginx-control-plane | ||
|
||
admissionWebhooks: | ||
enabled: false | ||
|
||
kind: Deployment | ||
|
||
replicaCount: 2 | ||
|
||
minAvailable: 0 | ||
|
||
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: | ||
loadBalancerIP: '__var__(salt.metalk8s_network.get_control_plane_ingress_ip())' | ||
externalTrafficPolicy: Local | ||
|
||
enableHttp: false | ||
|
||
ports: | ||
https: 8443 | ||
|
||
extraArgs: | ||
default-ssl-certificate: "metalk8s-ingress/ingress-control-plane-default-certificate" | ||
metrics-per-host: false | ||
|
||
metrics: | ||
enabled: true | ||
serviceMonitor: | ||
enabled: true | ||
additionalLabels: | ||
metalk8s.scality.com/monitor: '' | ||
|
||
defaultBackend: | ||
enabled: true | ||
|
||
image: | ||
repository: '__image__(nginx-ingress-defaultbackend-amd64)' | ||
|
||
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: '' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
existingConfigMap: metallb-config | ||
|
||
controller: | ||
image: | ||
registry: null | ||
repository: '__image__(metallb-controller)' | ||
|
||
nodeSelector: | ||
node-role.kubernetes.io/master: '' | ||
|
||
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" | ||
|
||
podAnnotations: | ||
checksum/config: '__slot__:salt:metalk8s_kubernetes.get_object_digest(kind="ConfigMap", apiVersion="v1", namespace="metalk8s-loadbalancing", name="metallb-config", path="data:config")' | ||
|
||
speaker: | ||
image: | ||
registry: null | ||
repository: '__image__(metallb-speaker)' | ||
|
||
nodeSelector: | ||
node-role.kubernetes.io/master: '' | ||
|
||
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" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.