From 215674f69a54af98379929785ecdae96b0420ec4 Mon Sep 17 00:00:00 2001 From: Byeonghoon Yoo Date: Sun, 14 Aug 2022 17:37:05 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- argocd/apps/jay-india.yaml | 2 +- charts/jay-india/Chart.yaml | 2 +- charts/jay-india/values.yaml | 2 +- charts/registry/Chart.yaml | 2 +- charts/registry/values.yaml | 2 +- values/grafana.yaml | 4 +- values/influxdb2.yaml | 4 +- values/prometheus-community.yaml | 8 +- values/rook/cluster.prod.yaml | 124 +++++++++++++++---------------- 9 files changed, 75 insertions(+), 75 deletions(-) diff --git a/argocd/apps/jay-india.yaml b/argocd/apps/jay-india.yaml index 50cca08..5feb7c2 100644 --- a/argocd/apps/jay-india.yaml +++ b/argocd/apps/jay-india.yaml @@ -15,7 +15,7 @@ spec: - values.yaml - https://raw.githubusercontent.com/isac322/homelab/HEAD/values/jay-india/prod.yaml repoURL: https://isac322.github.io/homelab - targetRevision: 0.1.0 + targetRevision: 0.1.1 syncPolicy: automated: prune: true diff --git a/charts/jay-india/Chart.yaml b/charts/jay-india/Chart.yaml index dbc9125..88e431c 100644 --- a/charts/jay-india/Chart.yaml +++ b/charts/jay-india/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.1.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/jay-india/values.yaml b/charts/jay-india/values.yaml index 2308b83..394080b 100644 --- a/charts/jay-india/values.yaml +++ b/charts/jay-india/values.yaml @@ -84,6 +84,6 @@ affinity: {} persistence: enabled: false - accessMode: ReadWriteMany + accessMode: ReadWriteOnce size: 500Mi storageClass: "" diff --git a/charts/registry/Chart.yaml b/charts/registry/Chart.yaml index 9fc90c7..002a2fb 100644 --- a/charts/registry/Chart.yaml +++ b/charts/registry/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for Docker Registry name: registry -version: 1.13.0 +version: 1.13.1 appVersion: 2.7.1 home: https://hub.docker.com/_/registry/ icon: https://hub.docker.com/public/images/logos/mini-logo.svg diff --git a/charts/registry/values.yaml b/charts/registry/values.yaml index 2ca731c..83db4d4 100644 --- a/charts/registry/values.yaml +++ b/charts/registry/values.yaml @@ -110,7 +110,7 @@ storage: type: "" persistence: enabled: false - accessMode: ReadWriteMany + accessMode: ReadWriteOnce size: 20Gi existingClaim: "" storageClass: "" diff --git a/values/grafana.yaml b/values/grafana.yaml index 62e9f32..5a4af0e 100644 --- a/values/grafana.yaml +++ b/values/grafana.yaml @@ -48,9 +48,9 @@ resources: persistence: type: pvc enabled: true - storageClassName: ceph-filesystem + storageClassName: ceph-block accessModes: - - ReadWriteMany + - ReadWriteOnce size: 10Gi # annotations: {} finalizers: diff --git a/values/influxdb2.yaml b/values/influxdb2.yaml index 3a26896..8218955 100644 --- a/values/influxdb2.yaml +++ b/values/influxdb2.yaml @@ -16,8 +16,8 @@ adminUser: persistence: enabled: true - storageClass: ceph-filesystem - accessMode: ReadWriteMany + storageClass: ceph-block + accessMode: ReadWriteOnce size: 50Gi ingress: diff --git a/values/prometheus-community.yaml b/values/prometheus-community.yaml index 08aaef1..b09ce10 100644 --- a/values/prometheus-community.yaml +++ b/values/prometheus-community.yaml @@ -66,7 +66,7 @@ alertmanager: ## Ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ ## accessModes: - - ReadWriteMany + - ReadWriteOnce ## alertmanager data Persistent Volume Claim annotations ## @@ -92,7 +92,7 @@ alertmanager: ## set, choosing the default provisioner. (gp2 on AWS, standard on ## GKE, AWS & OpenStack) ## - storageClass: "ceph-filesystem" + storageClass: "ceph-block" ## alertmanager data Persistent Volume Binding Mode ## If defined, volumeBindingMode: @@ -229,7 +229,7 @@ server: ## Ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ ## accessModes: - - ReadWriteMany + - ReadWriteOnce ## Prometheus server data Persistent Volume existing claim name ## Requires server.persistentVolume.enabled: true @@ -251,7 +251,7 @@ server: ## set, choosing the default provisioner. (gp2 on AWS, standard on ## GKE, AWS & OpenStack) ## - storageClass: "ceph-filesystem" + storageClass: "ceph-block" ## Prometheus server data Persistent Volume Binding Mode ## If defined, volumeBindingMode: diff --git a/values/rook/cluster.prod.yaml b/values/rook/cluster.prod.yaml index a07f272..9840528 100644 --- a/values/rook/cluster.prod.yaml +++ b/values/rook/cluster.prod.yaml @@ -103,82 +103,82 @@ ingress: secretName: ceph-com cephBlockPools: -# - name: ceph-blockpool -# # see https://github.com/rook/rook/blob/master/Documentation/ceph-pool-crd.md#spec for available configuration -# spec: -# failureDomain: host -# replicated: -# size: 3 -# storageClass: -# enabled: true -# name: ceph-block -# isDefault: true -# reclaimPolicy: Delete -# allowVolumeExpansion: true -# # see https://github.com/rook/rook/blob/master/Documentation/ceph-block.md#provision-storage for available configuration -# parameters: -# # (optional) mapOptions is a comma-separated list of map options. -# # For krbd options refer -# # https://docs.ceph.com/docs/master/man/8/rbd/#kernel-rbd-krbd-options -# # For nbd options refer -# # https://docs.ceph.com/docs/master/man/8/rbd-nbd/#options -# # mapOptions: lock_on_read,queue_depth=1024 -# -# # (optional) unmapOptions is a comma-separated list of unmap options. -# # For krbd options refer -# # https://docs.ceph.com/docs/master/man/8/rbd/#kernel-rbd-krbd-options -# # For nbd options refer -# # https://docs.ceph.com/docs/master/man/8/rbd-nbd/#options -# # unmapOptions: force -# -# # RBD image format. Defaults to "2". -# imageFormat: "2" -# # RBD image features. Available for imageFormat: "2". CSI RBD currently supports only `layering` feature. -# imageFeatures: layering -# # The secrets contain Ceph admin credentials. -# csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner -# csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph -# csi.storage.k8s.io/controller-expand-secret-name: rook-csi-rbd-provisioner -# csi.storage.k8s.io/controller-expand-secret-namespace: rook-ceph -# csi.storage.k8s.io/node-stage-secret-name: rook-csi-rbd-node -# csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph -# # Specify the filesystem type of the volume. If not specified, csi-provisioner -# # will set default as `ext4`. Note that `xfs` is not recommended due to potential deadlock -# # in hyperconverged settings where the volume is mounted on the same node as the osds. -# csi.storage.k8s.io/fstype: ext4 - -cephFileSystems: - - name: ceph-filesystem - # see https://github.com/rook/rook/blob/master/Documentation/ceph-filesystem-crd.md#filesystem-settings for available configuration + - name: ceph-blockpool + # see https://github.com/rook/rook/blob/master/Documentation/ceph-pool-crd.md#spec for available configuration spec: - metadataPool: - replicated: - size: 3 - dataPools: - - failureDomain: host - replicated: - size: 3 - metadataServer: - activeCount: 1 - activeStandby: true + failureDomain: host + replicated: + size: 3 storageClass: enabled: true - name: ceph-filesystem + name: ceph-block + isDefault: true reclaimPolicy: Delete - # see https://github.com/rook/rook/blob/master/Documentation/ceph-filesystem.md#provision-storage for available configuration + allowVolumeExpansion: true + # see https://github.com/rook/rook/blob/master/Documentation/ceph-block.md#provision-storage for available configuration parameters: + # (optional) mapOptions is a comma-separated list of map options. + # For krbd options refer + # https://docs.ceph.com/docs/master/man/8/rbd/#kernel-rbd-krbd-options + # For nbd options refer + # https://docs.ceph.com/docs/master/man/8/rbd-nbd/#options + # mapOptions: lock_on_read,queue_depth=1024 + + # (optional) unmapOptions is a comma-separated list of unmap options. + # For krbd options refer + # https://docs.ceph.com/docs/master/man/8/rbd/#kernel-rbd-krbd-options + # For nbd options refer + # https://docs.ceph.com/docs/master/man/8/rbd-nbd/#options + # unmapOptions: force + + # RBD image format. Defaults to "2". + imageFormat: "2" + # RBD image features. Available for imageFormat: "2". CSI RBD currently supports only `layering` feature. + imageFeatures: layering # The secrets contain Ceph admin credentials. - csi.storage.k8s.io/provisioner-secret-name: rook-csi-cephfs-provisioner + csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph - csi.storage.k8s.io/controller-expand-secret-name: rook-csi-cephfs-provisioner + csi.storage.k8s.io/controller-expand-secret-name: rook-csi-rbd-provisioner csi.storage.k8s.io/controller-expand-secret-namespace: rook-ceph - csi.storage.k8s.io/node-stage-secret-name: rook-csi-cephfs-node + csi.storage.k8s.io/node-stage-secret-name: rook-csi-rbd-node csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph # Specify the filesystem type of the volume. If not specified, csi-provisioner # will set default as `ext4`. Note that `xfs` is not recommended due to potential deadlock # in hyperconverged settings where the volume is mounted on the same node as the osds. csi.storage.k8s.io/fstype: ext4 +cephFileSystems: +# - name: ceph-filesystem +# # see https://github.com/rook/rook/blob/master/Documentation/ceph-filesystem-crd.md#filesystem-settings for available configuration +# spec: +# metadataPool: +# replicated: +# size: 3 +# dataPools: +# - failureDomain: host +# replicated: +# size: 3 +# metadataServer: +# activeCount: 1 +# activeStandby: true +# storageClass: +# enabled: true +# name: ceph-filesystem +# reclaimPolicy: Delete +# # see https://github.com/rook/rook/blob/master/Documentation/ceph-filesystem.md#provision-storage for available configuration +# parameters: +# # The secrets contain Ceph admin credentials. +# csi.storage.k8s.io/provisioner-secret-name: rook-csi-cephfs-provisioner +# csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph +# csi.storage.k8s.io/controller-expand-secret-name: rook-csi-cephfs-provisioner +# csi.storage.k8s.io/controller-expand-secret-namespace: rook-ceph +# csi.storage.k8s.io/node-stage-secret-name: rook-csi-cephfs-node +# csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph +# # Specify the filesystem type of the volume. If not specified, csi-provisioner +# # will set default as `ext4`. Note that `xfs` is not recommended due to potential deadlock +# # in hyperconverged settings where the volume is mounted on the same node as the osds. +# csi.storage.k8s.io/fstype: ext4 + cephObjectStores: # - name: object-store # # see https://github.com/rook/rook/blob/master/Documentation/ceph-object-store-crd.md#object-store-settings for available configuration