Merge pull request #188 from dnegreira/k8s_fixes

Fix k8s deployment

kubernetes/pipeline/02configure

@@ -60,6 +60,7 @@ fi
 # need min 2.7
 if ! is_hyperconverged; then
     MOD_OVERLAYS+=( "kubernetes/k8s-openstack-integrator.yaml" )
+    MOD_OVERLAYS+=( "kubernetes/k8s-openstack-cloud-controller.yaml" )
     if ! has_opt --no-trust && [[ ! "$JUJU_VERSION" < "2.7" ]]; then
         MOD_OVERLAYS+=( "kubernetes/k8s-openstack-integrator-trust.yaml" )
         JUJU_DEPLOY_OPTS=" --trust"

overlays/kubernetes/k8s-lb.yaml

@@ -5,6 +5,5 @@ applications:
     expose: true
     num_units: __NUM_K8S_LB_UNITS__
 relations:
-  - [ 'kubernetes-control-plane:kube-api-endpoint', 'kubeapi-load-balancer:apiserver' ]
-  - [ 'kubernetes-control-plane:loadbalancer', 'kubeapi-load-balancer:loadbalancer' ]
-  - [ 'kubernetes-worker:kube-api-endpoint', 'kubeapi-load-balancer:website' ]
+  - [ 'kubernetes-control-plane:loadbalancer-external', 'kubeapi-load-balancer:lb-consumers' ]
+  - [ 'kubernetes-control-plane:loadbalancer-internal', 'kubeapi-load-balancer:lb-consumers' ]

overlays/kubernetes/k8s-openstack-cloud-controller.yaml

@@ -0,0 +1,7 @@
+applications:
+  openstack-cloud-controller:
+    charm: __CHARM_STORE____CHARM_CS_NS____CHARM_CH_PREFIX__openstack-cloud-controller
+relations:
+  - [openstack-cloud-controller:certificates,            easyrsa:client]
+  - [openstack-cloud-controller:kube-control,            kubernetes-control-plane:kube-control]
+  - [openstack-cloud-controller:external-cloud-provider, kubernetes-control-plane:external-cloud-provider]

overlays/kubernetes/k8s-openstack-integrator.yaml

@@ -1,8 +1,6 @@
 applications:
   openstack-integrator:
     charm: __CHARM_STORE____CHARM_CS_NS____CHARM_CH_PREFIX__openstack-integrator
-    constraints: mem=1G
     num_units: 1
 relations:
-  - [ 'openstack-integrator:clients', 'kubernetes-control-plane:openstack' ]
-  - [ 'openstack-integrator:clients', 'kubernetes-worker:openstack' ]
+  - [ 'openstack-integrator:clients',  'openstack-cloud-controller:openstack']