feat: values.yaml example

AtomiCloud · Sep 30, 2023 · 323720f · 323720f
1 parent 9b3eda1
commit 323720f
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 84 deletions.
diff --git a/chart/Chart.lock b/chart/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: reloader
   repository: https://stakater.github.io/stakater-charts
-  version: v1.0.26
-digest: sha256:2a4fbefa7f9b26f8f36fd2951f04ef497dfad053e3adf348f07e6f977b771235
-generated: "2023-07-29T21:48:59.877648+08:00"
+  version: 1.0.41
+digest: sha256:8f0e85d1fdada89ee84f70eaa3f18a0bc3e6697fafe4b9d490f430b4fa082550
+generated: "2023-09-30T12:56:12.181327+08:00"
diff --git a/chart/README.md b/chart/README.md
@@ -14,40 +14,9 @@ Helm Chart to install reloader, ensuring pods are reloaded when secrets or confi
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| reloader.reloader.deployment.annotations."atomi.cloud/cluster" | string | `"opal"` |  |
-| reloader.reloader.deployment.annotations."atomi.cloud/landscape" | string | `"pichu"` |  |
-| reloader.reloader.deployment.annotations."atomi.cloud/layer" | string | `"1"` |  |
-| reloader.reloader.deployment.annotations."atomi.cloud/module" | string | `"operator"` |  |
-| reloader.reloader.deployment.annotations."atomi.cloud/platform" | string | `"systems"` |  |
-| reloader.reloader.deployment.annotations."atomi.cloud/service" | string | `"reloader"` |  |
-| reloader.reloader.deployment.labels."atomi.cloud/cluster" | string | `"opal"` |  |
-| reloader.reloader.deployment.labels."atomi.cloud/landscape" | string | `"pichu"` |  |
-| reloader.reloader.deployment.labels."atomi.cloud/layer" | string | `"1"` |  |
-| reloader.reloader.deployment.labels."atomi.cloud/module" | string | `"operator"` |  |
-| reloader.reloader.deployment.labels."atomi.cloud/platform" | string | `"systems"` |  |
-| reloader.reloader.deployment.labels."atomi.cloud/service" | string | `"reloader"` |  |
-| reloader.reloader.deployment.nodeSelector."kubernetes.io/os" | string | `"linux"` |  |
-| reloader.reloader.deployment.pod.annotations."atomi.cloud/cluster" | string | `"opal"` |  |
-| reloader.reloader.deployment.pod.annotations."atomi.cloud/landscape" | string | `"pichu"` |  |
-| reloader.reloader.deployment.pod.annotations."atomi.cloud/layer" | string | `"1"` |  |
-| reloader.reloader.deployment.pod.annotations."atomi.cloud/module" | string | `"operator"` |  |
-| reloader.reloader.deployment.pod.annotations."atomi.cloud/platform" | string | `"systems"` |  |
-| reloader.reloader.deployment.pod.annotations."atomi.cloud/service" | string | `"reloader"` |  |
-| reloader.reloader.deployment.resources.limits.cpu | string | `"500m"` |  |
-| reloader.reloader.deployment.resources.limits.memory | string | `"256Mi"` |  |
-| reloader.reloader.deployment.resources.requests.cpu | string | `"10m"` |  |
-| reloader.reloader.deployment.resources.requests.memory | string | `"128Mi"` |  |
-| reloader.reloader.deployment.topologySpreadConstraints[0].labelSelector.matchLabels."atomi.cloud/module" | string | `"operator"` |  |
-| reloader.reloader.deployment.topologySpreadConstraints[0].labelSelector.matchLabels."atomi.cloud/service" | string | `"reloader"` |  |
-| reloader.reloader.deployment.topologySpreadConstraints[0].maxSkew | int | `1` |  |
-| reloader.reloader.deployment.topologySpreadConstraints[0].topologyKey | string | `"topology.kubernetes.io/zone"` |  |
-| reloader.reloader.deployment.topologySpreadConstraints[0].whenUnsatisfiable | string | `"ScheduleAnyway"` |  |
-| reloader.reloader.reloadOnCreate | bool | `true` |  |
-| serviceTree.cluster | string | `"opal"` |  |
-| serviceTree.landscape | string | `"pichu"` |  |
-| serviceTree.layer | string | `"1"` |  |
-| serviceTree.platform | string | `"systems"` |  |
-| serviceTree.service | string | `"reloader"` |  |
+| reloader | object | `{"reloader":{"deployment":{"annotations":{"<<":{"atomi.cloud/layer":"1","atomi.cloud/platform":"sulfoxide","atomi.cloud/service":"chlorine"},"atomi.cloud/module":"operator"},"labels":{"<<":{"atomi.cloud/layer":"1","atomi.cloud/platform":"sulfoxide","atomi.cloud/service":"chlorine"},"atomi.cloud/module":"operator"},"nodeSelector":{},"pod":{"annotations":{"<<":{"atomi.cloud/layer":"1","atomi.cloud/platform":"sulfoxide","atomi.cloud/service":"chlorine"},"atomi.cloud/module":"operator"}},"resources":{"limits":{"cpu":"500m","memory":"256Mi"},"requests":{"cpu":"10m","memory":"128Mi"}},"topologySpreadConstraints":[{"labelSelector":{"matchLabels":{"<<":{"atomi.cloud/layer":"1","atomi.cloud/platform":"sulfoxide","atomi.cloud/service":"chlorine"},"atomi.cloud/module":"operator"}},"maxSkew":1,"topologyKey":"topology.kubernetes.io/zone","whenUnsatisfiable":"ScheduleAnyway"}]},"reloadOnCreate":true}}` | Reloader Configuration. See [Reloader Helm Chart Documentation](https://github.com/stakater/Reloader/blob/master/deployments/kubernetes/chart/reloader/values.yaml) |
+| serviceTree | object | `{"layer":"1","platform":"sulfoxide","service":"chlorine"}` | AtomiCloud Service Tree. See [ServiceTree](https://atomicloud.larksuite.com/wiki/OkfJwTXGFiMJkrk6W3RuwRrZs64?theme=DARK&contentTheme=DARK#MHw5d76uDo2tBLx86cduFQMRsBb) |
+| tags | object | `{"atomi.cloud/layer":"1","atomi.cloud/platform":"sulfoxide","atomi.cloud/service":"chlorine"}` | Kubernetes labels and annotations, following Service Tree |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.11.1](https://github.com/norwoodj/helm-docs/releases/v1.11.1)
diff --git a/chart/charts/reloader-1.0.41.tgz b/chart/charts/reloader-1.0.41.tgz
diff --git a/chart/charts/reloader-v1.0.26.tgz b/chart/charts/reloader-v1.0.26.tgz
diff --git a/chart/values.example.yaml b/chart/values.example.yaml
@@ -0,0 +1,29 @@
+serviceTree:
+  landscape: &landscape lapras
+  cluster: &cluster opal
+
+tags: &tags
+  atomi.cloud/landscape: *landscape
+  atomi.cloud/cluster: *cluster
+
+reloader:
+  reloader:
+    deployment:
+      topologySpreadConstraints:
+        - labelSelector:
+            matchLabels:
+              <<: *tags
+      resources:
+        limits:
+          cpu: 500m
+          memory: 256Mi
+        requests:
+          cpu: 10m
+          memory: 128Mi
+      annotations:
+        <<: *tags
+      labels:
+        <<: *tags
+      pod:
+        annotations:
+          <<: *tags
diff --git a/chart/values.pichu.opal.yaml b/chart/values.pichu.opal.yaml
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -1,10 +1,16 @@
+# -- AtomiCloud Service Tree. See [ServiceTree](https://atomicloud.larksuite.com/wiki/OkfJwTXGFiMJkrk6W3RuwRrZs64?theme=DARK&contentTheme=DARK#MHw5d76uDo2tBLx86cduFQMRsBb)
 serviceTree:
-  landscape: pichu
-  cluster: opal
-  platform: systems
-  service: reloader
-  layer: "1"
+  platform: &platform sulfoxide
+  service: &service chlorine
+  layer: &layer "1"
 
+# -- Kubernetes labels and annotations, following Service Tree
+tags: &tags
+  atomi.cloud/platform: *platform
+  atomi.cloud/service: *service
+  atomi.cloud/layer: *layer
+
+# -- Reloader Configuration. See [Reloader Helm Chart Documentation](https://github.com/stakater/Reloader/blob/master/deployments/kubernetes/chart/reloader/values.yaml)
 reloader:
   reloader:
     reloadOnCreate: true
@@ -15,10 +21,9 @@ reloader:
           whenUnsatisfiable: ScheduleAnyway
           labelSelector:
             matchLabels:
-              atomi.cloud/service: reloader
+              <<: *tags
               atomi.cloud/module: operator
-      nodeSelector:
-        kubernetes.io/os: linux
+      nodeSelector: {}
       resources:
         limits:
           cpu: 500m
@@ -27,24 +32,12 @@ reloader:
           cpu: 10m
           memory: 128Mi
       annotations:
-        atomi.cloud/landscape: pichu
-        atomi.cloud/cluster: opal
-        atomi.cloud/platform: systems
-        atomi.cloud/service: reloader
+        <<: *tags
         atomi.cloud/module: operator
-        atomi.cloud/layer: "1"
       labels:
-        atomi.cloud/landscape: pichu
-        atomi.cloud/cluster: opal
-        atomi.cloud/platform: systems
-        atomi.cloud/service: reloader
+        <<: *tags
         atomi.cloud/module: operator
-        atomi.cloud/layer: "1"
       pod:
         annotations:
-          atomi.cloud/landscape: pichu
-          atomi.cloud/cluster: opal
-          atomi.cloud/platform: systems
-          atomi.cloud/service: reloader
+          <<: *tags
           atomi.cloud/module: operator
-          atomi.cloud/layer: "1"