Skip to content

Commit

Permalink
Support loadbalancer interface between master and API LB (#796)
Browse files Browse the repository at this point in the history
* Support loadbalancer interface between master and API LB

Simplify the relations between the master, worker, and API LB charms in
favor of the newer `loadbalancer` interface relation.

Part of [lp:1897818][]
Depends on:
  * juju-solutions/loadbalancer-interface#13
  * juju-solutions/interface-kube-control#33
  * charmed-kubernetes/charm-kubernetes-control-plane#153
  * charmed-kubernetes/charm-kubernetes-worker#84
  * charmed-kubernetes/charm-kubeapi-load-balancer#11

[lp:1897818]: https://bugs.launchpad.net/charmed-kubernetes-testing/+bug/1897818

* Split k8s-master:lb-provider relation into external / internal

* Update core and converged bundle fragments
  • Loading branch information
johnsca committed May 24, 2021
1 parent 81742ec commit 707e54d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 14 deletions.
10 changes: 4 additions & 6 deletions fragments/k8s/cdk-converged/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ applications:
- 5
- 6
relations:
- - "kubernetes-master:kube-api-endpoint"
- "kubeapi-load-balancer:apiserver"
- - "kubernetes-master:loadbalancer"
- "kubeapi-load-balancer:loadbalancer"
- - "kubernetes-master:loadbalancer-external"
- "kubeapi-load-balancer:lb-consumers"
- - "kubernetes-master:loadbalancer-internal"
- "kubeapi-load-balancer:lb-consumers"
- - "kubernetes-master:kube-control"
- "kubernetes-worker:kube-control"
- - "kubernetes-master:certificates"
Expand All @@ -105,7 +105,5 @@ relations:
- "etcd:db"
- - "kubernetes-worker:certificates"
- "easyrsa:client"
- - "kubernetes-worker:kube-api-endpoint"
- "kubeapi-load-balancer:website"
- - "kubeapi-load-balancer:certificates"
- "easyrsa:client"
10 changes: 4 additions & 6 deletions fragments/k8s/cdk/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ applications:
"gui-x": "800"
"gui-y": "420"
relations:
- - "kubernetes-master:kube-api-endpoint"
- "kubeapi-load-balancer:apiserver"
- - "kubernetes-master:loadbalancer"
- "kubeapi-load-balancer:loadbalancer"
- - "kubernetes-master:loadbalancer-external"
- "kubeapi-load-balancer:lb-consumers"
- - "kubernetes-master:loadbalancer-internal"
- "kubeapi-load-balancer:lb-consumers"
- - "kubernetes-master:kube-control"
- "kubernetes-worker:kube-control"
- - "kubernetes-master:certificates"
Expand All @@ -61,7 +61,5 @@ relations:
- "etcd:db"
- - "kubernetes-worker:certificates"
- "easyrsa:client"
- - "kubernetes-worker:kube-api-endpoint"
- "kubeapi-load-balancer:website"
- - "kubeapi-load-balancer:certificates"
- "easyrsa:client"
2 changes: 0 additions & 2 deletions fragments/k8s/core/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ applications:
"gui-x": "800"
"gui-y": "420"
relations:
- - "kubernetes-master:kube-api-endpoint"
- "kubernetes-worker:kube-api-endpoint"
- - "kubernetes-master:kube-control"
- "kubernetes-worker:kube-control"
- - "kubernetes-master:certificates"
Expand Down

0 comments on commit 707e54d

Please sign in to comment.