From 098761dd86af385bab386ab1177765647341d63a Mon Sep 17 00:00:00 2001 From: Kevin W Monroe Date: Wed, 14 Feb 2024 18:09:20 -0600 Subject: [PATCH] remove juju 2.9 badges; bump root-disks to 64G and double k-c-p cpu/mem in the core bundle --- fragments/k8s/cdk-converged/README.md | 1 - fragments/k8s/cdk/README.md | 1 - fragments/k8s/cdk/bundle.yaml | 10 +++++----- fragments/k8s/core/README.md | 1 - fragments/k8s/core/bundle.yaml | 8 ++++---- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/fragments/k8s/cdk-converged/README.md b/fragments/k8s/cdk-converged/README.md index 4e69680..cf4fc38 100644 --- a/fragments/k8s/cdk-converged/README.md +++ b/fragments/k8s/cdk-converged/README.md @@ -1,7 +1,6 @@ # The Charmed Distribution of Kubernetes (converged) ![](https://img.shields.io/badge/kubernetes-1.29-brightgreen.svg) -![](https://img.shields.io/badge/juju-2.9+-brightgreen.svg) ![](https://img.shields.io/badge/juju-3.1+-brightgreen.svg) diff --git a/fragments/k8s/cdk/README.md b/fragments/k8s/cdk/README.md index aa45be3..4e0217d 100644 --- a/fragments/k8s/cdk/README.md +++ b/fragments/k8s/cdk/README.md @@ -1,7 +1,6 @@ # Charmed Kubernetes ![](https://img.shields.io/badge/kubernetes-1.29-brightgreen.svg) -![](https://img.shields.io/badge/juju-2.9+-brightgreen.svg) ![](https://img.shields.io/badge/juju-3.1+-brightgreen.svg) diff --git a/fragments/k8s/cdk/bundle.yaml b/fragments/k8s/cdk/bundle.yaml index 09ca23e..4099646 100644 --- a/fragments/k8s/cdk/bundle.yaml +++ b/fragments/k8s/cdk/bundle.yaml @@ -11,7 +11,7 @@ applications: num_units: 2 options: channel: 1.29/edge - constraints: "cores=2 mem=8G root-disk=16G" + constraints: "cores=2 mem=8G root-disk=64G" annotations: "gui-x": "800" "gui-y": "850" @@ -19,14 +19,14 @@ applications: charm: "kubeapi-load-balancer" num_units: 1 expose: true - constraints: "cores=1 mem=4G root-disk=16G" + constraints: "cores=1 mem=4G root-disk=64G" annotations: "gui-x": "450" "gui-y": "250" "easyrsa": charm: "easyrsa" num_units: 1 - constraints: "cores=1 mem=4G root-disk=16G" + constraints: "cores=1 mem=4G root-disk=64G" annotations: "gui-x": "90" "gui-y": "420" @@ -36,7 +36,7 @@ applications: options: channel: 1.29/edge expose: true - constraints: "cores=2 mem=8G root-disk=16G" + constraints: "cores=2 mem=8G root-disk=64G" annotations: "gui-x": "90" "gui-y": "850" @@ -45,7 +45,7 @@ applications: num_units: 3 options: channel: 3.4/stable - constraints: "cores=2 mem=8G root-disk=16G" + constraints: "cores=2 mem=8G root-disk=64G" annotations: "gui-x": "800" "gui-y": "420" diff --git a/fragments/k8s/core/README.md b/fragments/k8s/core/README.md index aa3a88a..e77bd5f 100644 --- a/fragments/k8s/core/README.md +++ b/fragments/k8s/core/README.md @@ -1,7 +1,6 @@ # Kubernetes Core Bundle ![](https://img.shields.io/badge/kubernetes-1.29-brightgreen.svg) -![](https://img.shields.io/badge/juju-2.9+-brightgreen.svg) ![](https://img.shields.io/badge/juju-3.1+-brightgreen.svg) ## Overview diff --git a/fragments/k8s/core/bundle.yaml b/fragments/k8s/core/bundle.yaml index 0bfc587..19fd1c7 100644 --- a/fragments/k8s/core/bundle.yaml +++ b/fragments/k8s/core/bundle.yaml @@ -14,7 +14,7 @@ applications: options: channel: 1.29/edge expose: true - constraints: "cores=2 mem=8G root-disk=16G" + constraints: "cores=4 mem=16G root-disk=64G" annotations: "gui-x": "800" "gui-y": "850" @@ -34,7 +34,7 @@ applications: options: channel: 1.29/edge expose: true - constraints: "cores=2 mem=8G root-disk=16G" + constraints: "cores=2 mem=8G root-disk=64G" annotations: "gui-x": "90" "gui-y": "850" @@ -61,6 +61,6 @@ relations: - "easyrsa:client" machines: "0": - constraints: "cores=2 mem=8G root-disk=16G" + constraints: "cores=4 mem=16G root-disk=64G" "1": - constraints: "cores=2 mem=8G root-disk=16G" + constraints: "cores=2 mem=8G root-disk=64G"