Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update overlays to reference 1.24/stable charms #833

Merged
merged 4 commits into from May 10, 2022
Merged

update overlays to reference 1.24/stable charms #833

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9dae1a
Revert "revert overlays to use charmstore charms until a 1.24 release…
addyess May 5, 2022
4c413c1
remove cs: prefix
addyess May 5, 2022
8a72ccf
Update overlays/vault-pki-overlay.yaml
addyess May 5, 2022
20ff81f
Remove ceph-storage relation
addyess May 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions overlays/aws-overlay.yaml
View file
Open in desktop
Expand Up @@ -4,9 +4,9 @@ applications:
annotations:
gui-x: "600"
gui-y: "300"
charm: cs:~containers/aws-integrator
charm: aws-integrator
num_units: 1
trust: true
relations:
- ['aws-integrator', 'kubernetes-master']
- ['aws-integrator', 'kubernetes-control-plane']
- ['aws-integrator', 'kubernetes-worker']
4 changes: 2 additions & 2 deletions overlays/azure-overlay.yaml
View file
Open in desktop
Expand Up @@ -4,9 +4,9 @@ applications:
annotations:
gui-x: "600"
gui-y: "300"
charm: cs:~containers/azure-integrator
charm: azure-integrator
num_units: 1
trust: true
relations:
- ['azure-integrator', 'kubernetes-master:azure']
- ['azure-integrator', 'kubernetes-control-plane:azure']
- ['azure-integrator', 'kubernetes-worker:azure']
2 changes: 1 addition & 1 deletion overlays/bdc-overlay.yaml
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ machines:
'1':
constraints: cores=8 mem=64G root-disk=100G
applications:
kubernetes-master:
kubernetes-control-plane:
options:
allow-privileged: 'True'

4 changes: 2 additions & 2 deletions overlays/calico-overlay.yaml
View file
Open in desktop
Expand Up @@ -4,12 +4,12 @@ applications:
annotations:
gui-x: '480'
gui-y: '750'
charm: cs:~containers/calico
charm: calico
flannel:
relations:
- - calico:etcd
- etcd:db
- - calico:cni
- kubernetes-master:cni
- kubernetes-control-plane:cni
- - calico:cni
- kubernetes-worker:cni
4 changes: 2 additions & 2 deletions overlays/canal-overlay.yaml
View file
Open in desktop
Expand Up @@ -4,12 +4,12 @@ applications:
annotations:
gui-x: '450'
gui-y: '750'
charm: cs:~containers/canal
charm: canal
flannel:
relations:
- - canal:etcd
- etcd:db
- - canal:cni
- kubernetes-master:cni
- kubernetes-control-plane:cni
- - canal:cni
- kubernetes-worker:cni
4 changes: 2 additions & 2 deletions overlays/ceph-fs.yaml
View file
Open in desktop
Expand Up @@ -17,5 +17,5 @@ applications:
relations:
- ['ceph-fs:ceph-mds', 'ceph-mon:mds']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-mon:admin', 'kubernetes-master']
- ['ceph-mon:client', 'kubernetes-master']
- ['ceph-mon:admin', 'kubernetes-control-plane']
- ['ceph-mon:client', 'kubernetes-control-plane']
4 changes: 2 additions & 2 deletions overlays/ceph-rbd.yaml
View file
Open in desktop
Expand Up @@ -11,5 +11,5 @@ applications:
num_units: 3
relations:
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-mon:admin', 'kubernetes-master']
- ['ceph-mon:client', 'kubernetes-master']
- ['ceph-mon:admin', 'kubernetes-control-plane']
- ['ceph-mon:client', 'kubernetes-control-plane']
14 changes: 7 additions & 7 deletions overlays/equinix-overlay.yaml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ machines:
constraints: mem=32G
applications:
calico:
charm: cs:~containers/calico
charm: calico
annotations:
gui-x: '450'
gui-y: '750'
Expand Down Expand Up @@ -83,7 +83,7 @@ applications:
"": alpha
to:
- lxd:1
kubernetes-master:
kubernetes-control-plane:
options:
authorization-mode: "RBAC,Node"
channel: 1.22/stable
Expand Down Expand Up @@ -125,20 +125,20 @@ relations:
- - 'calico:etcd'
- 'etcd:db'
- - 'calico:cni'
- 'kubernetes-master:cni'
- 'kubernetes-control-plane:cni'
- - 'calico:cni'
- 'kubernetes-worker:cni'
- - 'kubernetes-master:ceph-storage'
- - 'kubernetes-control-plane:ceph-storage'
- 'ceph-mon:admin'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- - 'kubernetes-control-plane:ceph-storage'
- 'ceph-mon:admin'

We dropped the ceph-storage relation in charmed-kubernetes/charm-kubernetes-control-plane#219

- - 'kubernetes-master:ceph-client'
- - 'kubernetes-control-plane:ceph-client'
- 'ceph-mon:client'
- - 'ceph-mon:radosgw'
- 'ceph-radosgw:mon'
- - 'ceph-fs:ceph-mds'
- 'ceph-mon:mds'
- - 'kubernetes-master:kube-api-endpoint'
- - 'kubernetes-control-plane:kube-api-endpoint'
- 'kubeapi-load-balancer:apiserver'
- - 'kubeapi-load-balancer:loadbalancer'
- 'kubernetes-master:loadbalancer'
- 'kubernetes-control-plane:loadbalancer'
- - 'kubeapi-load-balancer:website'
- 'kubernetes-worker:kube-api-endpoint'
4 changes: 2 additions & 2 deletions overlays/gcp-overlay.yaml
View file
Open in desktop
Expand Up @@ -4,9 +4,9 @@ applications:
annotations:
gui-x: "600"
gui-y: "300"
charm: cs:~containers/gcp-integrator
charm: gcp-integrator
num_units: 1
trust: true
relations:
- ['gcp-integrator', 'kubernetes-master']
- ['gcp-integrator', 'kubernetes-control-plane']
- ['gcp-integrator', 'kubernetes-worker']
2 changes: 1 addition & 1 deletion overlays/ipv4-ipv6-overlay.yaml
View file
Open in desktop
Expand Up @@ -3,6 +3,6 @@ applications:
calico:
options:
cidr: "192.168.0.0/16,fd00:c00b:1::/112"
kubernetes-master:
kubernetes-control-plane:
options:
service-cidr: "10.152.183.0/24,fd00:c00b:2::/112"
2 changes: 1 addition & 1 deletion overlays/logging-egf-overlay.yaml
View file
Open in desktop
Expand Up @@ -31,6 +31,6 @@ relations:
- ["apache2:reverseproxy", "graylog:website"]
- ["graylog:elasticsearch", "elasticsearch:client"]
- ["graylog:mongodb", "mongodb:database"]
- ["filebeat:beats-host", "kubernetes-master:juju-info"]
- ["filebeat:beats-host", "kubernetes-control-plane:juju-info"]
- ["filebeat:beats-host", "kubernetes-worker:juju-info"]
- ["filebeat:logstash", "graylog:beats"]
6 changes: 3 additions & 3 deletions overlays/monitoring-pgt-overlay.yaml
View file
Open in desktop
Expand Up @@ -12,10 +12,10 @@ applications:
relations:
- [prometheus:grafana-source, grafana:grafana-source]
- [telegraf:prometheus-client, prometheus:target]
- [kubernetes-master:juju-info, telegraf:juju-info]
- [kubernetes-control-plane:juju-info, telegraf:juju-info]
- [kubernetes-worker:juju-info, telegraf:juju-info]
- [kubernetes-master:prometheus, prometheus:manual-jobs]
- [kubernetes-master:grafana, grafana:dashboards]
- [kubernetes-control-plane:prometheus, prometheus:manual-jobs]
- [kubernetes-control-plane:grafana, grafana:dashboards]
- [prometheus:certificates, easyrsa:client]
- [etcd:grafana, grafana:dashboards]
- [etcd:prometheus, prometheus:manual-jobs]
8 changes: 4 additions & 4 deletions overlays/openstack-lb-overlay.yaml
View file
Open in desktop
Expand Up @@ -4,11 +4,11 @@ applications:
annotations:
gui-x: "600"
gui-y: "300"
charm: cs:~containers/openstack-integrator
charm: openstack-integrator
num_units: 1
trust: true
relations:
- ['kubernetes-master:kube-api-endpoint', 'kubernetes-worker:kube-api-endpoint']
- ['openstack-integrator', 'kubernetes-master:loadbalancer']
- ['openstack-integrator', 'kubernetes-master:openstack']
- ['kubernetes-control-plane:kube-api-endpoint', 'kubernetes-worker:kube-api-endpoint']
- ['openstack-integrator', 'kubernetes-control-plane:loadbalancer']
- ['openstack-integrator', 'kubernetes-control-plane:openstack']
- ['openstack-integrator', 'kubernetes-worker:openstack']
4 changes: 2 additions & 2 deletions overlays/openstack-overlay.yaml
View file
Open in desktop
Expand Up @@ -4,9 +4,9 @@ applications:
annotations:
gui-x: "600"
gui-y: "300"
charm: cs:~containers/openstack-integrator
charm: openstack-integrator
num_units: 1
trust: true
relations:
- ['openstack-integrator', 'kubernetes-master:openstack']
- ['openstack-integrator', 'kubernetes-control-plane:openstack']
- ['openstack-integrator', 'kubernetes-worker:openstack']
6 changes: 3 additions & 3 deletions overlays/tigera-overlay.yaml
View file
Open in desktop
Expand Up @@ -4,14 +4,14 @@ applications:
annotations:
gui-x: '450'
gui-y: '750'
charm: cs:~containers/tigera-secure-ee
charm: tigera-secure-ee
flannel:
relations:
- - tigera-secure-ee:etcd
- etcd:db
- - tigera-secure-ee:cni
- kubernetes-master:cni
- kubernetes-control-plane:cni
- - tigera-secure-ee:cni
- kubernetes-worker:cni
- - tigera-secure-ee:kube-api-endpoint
- kubernetes-master:kube-api-endpoint
- kubernetes-control-plane:kube-api-endpoint
2 changes: 1 addition & 1 deletion overlays/vault-pki-ha-overlay.yaml
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ applications:
charm: percona-cluster
num_units: 1
relations:
- - kubernetes-master:certificates
- - kubernetes-control-plane:certificates
- vault:certificates
- - etcd:certificates
- vault:certificates
Expand Down
4 changes: 2 additions & 2 deletions overlays/vault-pki-overlay.yaml
View file
Open in desktop
Expand Up @@ -6,10 +6,10 @@ applications:
options:
auto-generate-root-ca-cert: true
percona-cluster:
charm: percona-cluster
charm: cs:percona-cluster
addyess marked this conversation as resolved.
Show resolved Hide resolved
addyess marked this conversation as resolved.
Show resolved Hide resolved
num_units: 1
relations:
- - kubernetes-master:certificates
- - kubernetes-control-plane:certificates
- vault:certificates
- - etcd:certificates
- vault:certificates
Expand Down
4 changes: 2 additions & 2 deletions overlays/vsphere-overlay.yaml
View file
Open in desktop
Expand Up @@ -4,9 +4,9 @@ applications:
annotations:
gui-x: "600"
gui-y: "300"
charm: cs:~containers/vsphere-integrator
charm: vsphere-integrator
num_units: 1
trust: true
relations:
- ['vsphere-integrator', 'kubernetes-master']
- ['vsphere-integrator', 'kubernetes-control-plane']
- ['vsphere-integrator', 'kubernetes-worker']