Merge "Add support for master elected component"

changes/35/303235/10
Jenkins 6 years ago committed by Gerrit Code Review
commit bc7319db8b
  1. 1
      magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-controller-manager.yaml
  2. 1
      magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-scheduler.yaml
  3. 2
      magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/enable-kube-podmaster.sh

@ -50,6 +50,7 @@ write_files:
- /hyperkube
- controller-manager
- --master=http://127.0.0.1:8080
- --leader-elect=true
- --service-account-private-key-file=${SERVICE_ACCOUNT_PRIVATE_KEY_FILE}
- --root-ca-file=${ROOT_CA_FILE}
livenessProbe:

@ -40,6 +40,7 @@ write_files:
- /hyperkube
- scheduler
- --master=http://127.0.0.1:8080
- --leader-elect=true
livenessProbe:
httpGet:
host: 127.0.0.1

@ -90,6 +90,7 @@ spec:
- /hyperkube
- controller-manager
- --master=http://127.0.0.1:8080
- --leader-elect=true
- --service-account-private-key-file=${SERVICE_ACCOUNT_PRIVATE_KEY_FILE}
- --root-ca-file=${ROOT_CA_FILE}
livenessProbe:
@ -136,6 +137,7 @@ spec:
- /hyperkube
- scheduler
- --master=http://127.0.0.1:8080
- --leader-elect=true
livenessProbe:
httpGet:
host: 127.0.0.1

Loading…
Cancel
Save