diff options
Diffstat (limited to 'type')
| -rw-r--r-- | type/cntt/software/charts/osh-infra/elasticsearch.yaml | 42 | ||||
| -rw-r--r-- | type/cntt/software/charts/osh-infra/fluentbit.yaml | 6 | ||||
| -rw-r--r-- | type/cntt/software/charts/osh-infra/fluentd.yaml | 6 | ||||
| -rw-r--r-- | type/cntt/software/charts/osh-infra/grafana.yaml | 23 | ||||
| -rw-r--r-- | type/cntt/software/charts/osh-infra/ingress.yaml | 24 | ||||
| -rw-r--r-- | type/cntt/software/charts/osh-infra/mariadb.yaml | 24 | ||||
| -rw-r--r-- | type/cntt/software/charts/osh-infra/prometheus.yaml | 4 |
7 files changed, 42 insertions, 87 deletions
diff --git a/type/cntt/software/charts/osh-infra/elasticsearch.yaml b/type/cntt/software/charts/osh-infra/elasticsearch.yaml index 3621e75..def7b1e 100644 --- a/type/cntt/software/charts/osh-infra/elasticsearch.yaml +++ b/type/cntt/software/charts/osh-infra/elasticsearch.yaml @@ -18,9 +18,45 @@ data: values: pod: replicas: - master: 2 - data: 1 - client: 2 + client: 3 + resources: + enabled: true + apache_proxy: + limits: + memory: "1024Mi" + cpu: "2000m" + requests: + memory: "0" + cpu: "0" + client: + requests: + memory: "4Gi" + cpu: "1000m" + limits: + memory: "8Gi" + cpu: "2000m" + master: + requests: + memory: "4Gi" + cpu: "1000m" + limits: + memory: "8Gi" + cpu: "2000m" + data: + requests: + memory: "4Gi" + cpu: "1000m" + limits: + memory: "8Gi" + cpu: "2000m" + prometheus_elasticsearch_exporter: + requests: + memory: "0" + cpu: "0" + limits: + memory: "1024Mi" + cpu: "2000m" + storage: requests: storage: 40Gi diff --git a/type/cntt/software/charts/osh-infra/fluentbit.yaml b/type/cntt/software/charts/osh-infra/fluentbit.yaml index 1d176cd..cbe4121 100644 --- a/type/cntt/software/charts/osh-infra/fluentbit.yaml +++ b/type/cntt/software/charts/osh-infra/fluentbit.yaml @@ -14,9 +14,5 @@ metadata: - method: merge path: . storagePolicy: cleartext -data: - values: - pod: - replicas: - fluentd: 1 +data: {} ... diff --git a/type/cntt/software/charts/osh-infra/fluentd.yaml b/type/cntt/software/charts/osh-infra/fluentd.yaml index 906b26d..430f4f4 100644 --- a/type/cntt/software/charts/osh-infra/fluentd.yaml +++ b/type/cntt/software/charts/osh-infra/fluentd.yaml @@ -14,9 +14,5 @@ metadata: - method: merge path: . storagePolicy: cleartext -data: - values: - pod: - replicas: - fluentd: 1 +data: {} ... diff --git a/type/cntt/software/charts/osh-infra/grafana.yaml b/type/cntt/software/charts/osh-infra/grafana.yaml deleted file mode 100644 index d12f7d2..0000000 --- a/type/cntt/software/charts/osh-infra/grafana.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - replacement: true - name: grafana - labels: - name: grafana-type - layeringDefinition: - abstract: false - layer: type - parentSelector: - name: grafana-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - pod: - replicas: - grafana: 1 -... diff --git a/type/cntt/software/charts/osh-infra/ingress.yaml b/type/cntt/software/charts/osh-infra/ingress.yaml deleted file mode 100644 index 96753c9..0000000 --- a/type/cntt/software/charts/osh-infra/ingress.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - replacement: true - name: osh-infra-ingress-controller - labels: - name: osh-infra-ingress-controller-type - layeringDefinition: - abstract: false - layer: type - parentSelector: - name: osh-infra-ingress-controller-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - pod: - replicas: - ingress: 1 - error_page: 1 -... diff --git a/type/cntt/software/charts/osh-infra/mariadb.yaml b/type/cntt/software/charts/osh-infra/mariadb.yaml deleted file mode 100644 index ddb4424..0000000 --- a/type/cntt/software/charts/osh-infra/mariadb.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - replacement: true - name: osh-infra-mariadb - labels: - name: osh-infra-mariadb-type - layeringDefinition: - abstract: false - layer: type - parentSelector: - name: osh-infra-mariadb-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - pod: - replicas: - server: 1 - ingress: 1 -... diff --git a/type/cntt/software/charts/osh-infra/prometheus.yaml b/type/cntt/software/charts/osh-infra/prometheus.yaml index 4b02c04..d92b7d0 100644 --- a/type/cntt/software/charts/osh-infra/prometheus.yaml +++ b/type/cntt/software/charts/osh-infra/prometheus.yaml @@ -18,8 +18,6 @@ metadata: data: values: pod: - replicas: - prometheus: 1 resources: enabled: true prometheus: @@ -31,5 +29,5 @@ data: cpu: "1000m" storage: requests: - storage: 50Gi + storage: 40Gi ... |