k8s_fedora: Make CoreDNS config a SoftwareDeployment

After adding the autoscaler for coredns, the limit
for user_data was reached again. Make coredns
config a SoftwareDeployment.

Change-Id: I0a9852e9293842e859947acf0c4b6da20394436a
Closes-Bug: #1757554
This commit is contained in:
Spyros Trigazis 2018-05-07 09:41:46 +00:00
parent e2d3fee1b3
commit 38878fd642
2 changed files with 16 additions and 9 deletions

View File

@ -5,7 +5,7 @@
_dns_prefix=${CONTAINER_INFRA_PREFIX:-docker.io/coredns/}
_autoscaler_prefix=${CONTAINER_INFRA_PREFIX:-docker.io/googlecontainer/}
CORE_DNS=/etc/kubernetes/manifests/kube-coredns.yaml
CORE_DNS=/srv/magnum/kubernetes/manifests/kube-coredns.yaml
[ -f ${CORE_DNS} ] || {
echo "Writing File: $CORE_DNS"
mkdir -p $(dirname ${CORE_DNS})
@ -251,4 +251,4 @@ do
sleep 5
done
kubectl create --validate=false -f $CORE_DNS
kubectl apply --validate=false -f $CORE_DNS

View File

@ -522,12 +522,6 @@ resources:
group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh}
core_dns_service:
type: OS::Heat::SoftwareConfig
properties:
group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/core-dns-service.sh}
master_wc_notify:
type: OS::Heat::SoftwareConfig
properties:
@ -570,9 +564,22 @@ resources:
- config: {get_resource: write_network_config}
- config: {get_resource: network_config_service}
- config: {get_resource: kube_apiserver_to_kubelet_role}
- config: {get_resource: core_dns_service}
- config: {get_resource: master_wc_notify}
core_dns_service:
type: OS::Heat::SoftwareConfig
properties:
group: script
config: {get_file: ../../common/templates/kubernetes/fragments/core-dns-service.sh}
core_dns_service_deployment:
type: OS::Heat::SoftwareDeployment
properties:
signal_transport: HEAT_SIGNAL
config: {get_resource: core_dns_service}
server: {get_resource: kube-master}
actions: ['CREATE']
enable_prometheus_monitoring:
type: OS::Heat::SoftwareConfig
properties: