diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index d933766..0475dd0 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -37,26 +37,6 @@ - 89.45.236.6 k8sw5 - 89.46.21.195 k8sw6 traefik: false -'^k8sc[1-9].matrix.sunet.se$': - sunet::microk8s::node: - channel: 1.31/stable - peers: - - 89.47.190.40 k8sc1 - - 89.47.190.118 k8sc2 - - 89.47.191.240 k8sc3 - - 89.47.190.86 k8sw1 - - 89.47.190.135 k8sw2 - - 89.47.191.12 k8sw3 -'^k8sw[1-9].matrix.sunet.se$': - sunet::microk8s::node: - channel: 1.31/stable - peers: - - 89.47.190.40 k8sc1 - - 89.47.190.118 k8sc2 - - 89.47.191.240 k8sc3 - - 89.47.190.86 k8sw1 - - 89.47.190.135 k8sw2 - - 89.47.191.12 k8sw3 '^lb[1-9]\.matrix\.test\.sunet\.se$': matrix::lb: '^mgmt[1-9]\.matrix\.test\.sunet\.se$': @@ -64,3 +44,34 @@ rootless: true rlusers: - matrixinstaller + +'^k8sc[1-9].matrix.sunet.se$': + sunet::microk8s::node: + channel: 1.31/stable + peers: + - 89.47.190.119 k8sc1 + - 89.45.237.43 k8sc2 + - 89.46.21.148 k8sc3 + - 89.47.190.103 k8sw1 + - 89.45.237.161 k8sw2 + - 89.46.20.60 k8sw3 + - 89.47.190.237 k8sw4 + - 89.45.236.55 k8sw5 + - 89.46.20.191 k8sw6 + traefik: false +'^k8sw[1-9].matrix.sunet.se$': + sunet::microk8s::node: + channel: 1.31/stable + peers: + - 89.47.190.119 k8sc1 + - 89.45.237.43 k8sc2 + - 89.46.21.148 k8sc3 + - 89.47.190.103 k8sw1 + - 89.45.237.161 k8sw2 + - 89.46.20.60 k8sw3 + - 89.47.190.237 k8sw4 + - 89.45.236.55 k8sw5 + - 89.46.20.191 k8sw6 + traefik: false +'^lb[1-9]\.matrix\.sunet\.se$': + matrix::lb: diff --git a/k8s/postgres/README.md b/k8s/postgres/README.md index d453169..f165c1e 100644 --- a/k8s/postgres/README.md +++ b/k8s/postgres/README.md @@ -1,3 +1,7 @@ ### Postgres password To create the postgres password secret you can use the following command. +kubectl apply -f postgres-namespace.yaml +kubectl apply -f postgres-pvc.yaml kubectl create secret generic postgres-secret --from-literal=postgres-password=xxXxXxX -n postgres +kubectl apply -f postgres-deployment.yaml +kubectl apply -f postgres-service.yaml