ZeroDownTime/KubeZero
3
0
Fork 0
Code Issues 1 Pull Requests 21 Packages Projects Releases Wiki Activity

feat: update kuberzero-redis incl. cleanup for clusters etc.

Browse Source
This commit is contained in:
Stefan Reimer 2021-08-05 13:52:22 +02:00
parent 721dbddd52
commit 5b18ae575b
14 changed files with 105 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/kubezero-aws-ebs-csi-driver/Chart.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v2
name: kubezero-aws-ebs-csi-driver
description: KubeZero Umbrella Chart for aws-ebs-csi-driver
type: application
version: 0.6.3
version: 0.6.4
appVersion: 1.2.4
home: https://kubezero.com
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png

7
charts/kubezero-aws-ebs-csi-driver/README.md
View File

@ -1,6 +1,6 @@
# kubezero-aws-ebs-csi-driver
![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.3](https://img.shields.io/badge/AppVersion-1.2.3-informational?style=flat-square)
![Version: 0.6.4](https://img.shields.io/badge/Version-0.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.4](https://img.shields.io/badge/AppVersion-1.2.4-informational?style=flat-square)
KubeZero Umbrella Chart for aws-ebs-csi-driver
@ -23,7 +23,7 @@ Kubernetes: `>= 1.18.0`
| Repository | Name | Version |
|------------|------|---------|
| | aws-ebs-csi-driver | 1.2.3 |
| | aws-ebs-csi-driver | 1.2.4 |
| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 |
## IAM Role
@ -50,6 +50,9 @@ This class is by default also set as default storage class.
| aws-ebs-csi-driver.controller.tolerations[0].effect | string | `"NoSchedule"` | |
| aws-ebs-csi-driver.controller.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | |
| aws-ebs-csi-driver.enableVolumeSnapshot | bool | `true` | |
| aws-ebs-csi-driver.node.tolerations[0].effect | string | `"NoSchedule"` | |
| aws-ebs-csi-driver.node.tolerations[0].key | string | `"kubezero-workergroup"` | |
| aws-ebs-csi-driver.node.tolerations[0].operator | string | `"Exists"` | |
| aws-ebs-csi-driver.nodeSelector."node-role.kubernetes.io/master" | string | `""` | |
| aws-ebs-csi-driver.storageClasses[0].allowVolumeExpansion | bool | `true` | |
| aws-ebs-csi-driver.storageClasses[0].name | string | `"ebs-sc-gp2-xfs"` | |

2
charts/kubezero-lib/Chart.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v2
name: kubezero-lib
description: KubeZero helm library - common helm functions and blocks
type: library
version: 0.1.3
version: 0.1.4
home: https://kubezero.com
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
keywords:

30
charts/kubezero-lib/templates/_helpers.tpl
View File

@ -1,14 +1,3 @@
{{- /*
Common set of labels
*/ -}}
{{- define "kubezero-lib.labels" -}}
helm.sh/chart: {{ include "kubezero-lib.chart" . }}
app.kubernetes.io/name: {{ include "kubezero-lib.name" . }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/part-of: kubezero
{{- end -}}
{{- /*
Common naming functions
*/ -}}
@ -32,3 +21,22 @@ Common naming functions
{{- define "kubezero-lib.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Selector labels
*/}}
{{- define "kubezero-lib.selectorLabels" -}}
app.kubernetes.io/name: {{ include "kubezero-lib.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}
{{- /*
Common set of labels
*/ -}}
{{- define "kubezero-lib.labels" -}}
helm.sh/chart: {{ include "kubezero-lib.chart" . }}
{{ include "kubezero-lib.selectorLabels" . }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: kubezero
{{- end -}}

2
charts/kubezero-metrics/Chart.yaml
View File

@ -14,7 +14,7 @@ maintainers:
- name: Quarky9
dependencies:
- name: kubezero-lib
version: ">= 0.1.3"
version: ">= 0.1.4"
repository: https://zero-down-time.github.io/kubezero/
- name: kube-prometheus-stack
version: 17.0.3

2
charts/kubezero-metrics/README.md.gotmpl
View File

@ -21,3 +21,5 @@
- https://grafana.com/api/dashboards/9578/revisions/4/download
## Prometheus
- https://grafana.com/api/dashboards/3662/revisions/2/download
## AlertManager SNS Forwarder
- https://github.com/DataReply/alertmanager-sns-forwarder

4
charts/kubezero-metrics/templates/dashboard-gunzip-cm.yaml
View File

@ -7,5 +7,5 @@ metadata:
{{ include "kubezero-lib.labels" $ | indent 4 }}
data:
script.sh: |-
#!/bin/sh
find /tmp/dashboards -name "*.gz" -exec gunzip -f -k {} \;
#!/bin/sh
find /tmp/dashboards -name "*.gz" -exec gunzip -f -k {} \;

61
charts/kubezero-metrics/values.yaml
View File

@ -5,6 +5,9 @@ kube-prometheus-stack:
defaultRules:
create: true
#additionalRuleLabels:
# clusterName: myTestCluster
# awsRegion: eu-central-1
coreDns:
enabled: true
@ -199,6 +202,64 @@ kube-prometheus-stack:
# externalUrl:
logFormat: json
# for none AWS cluster or if SNS AlertHub should NOT be used, remove sns-forwarder by overwriting containers eg.:
# containers: []
# Add sns-forwarder to AlertManager pod, see: https://github.com/DataReply/alertmanager-sns-forwarder
# uses the alertmanager serviceaccount to assume IAM role, requires annotation: kubezero.com/sns_forwarder_arn_prefix to point to SNSAlertHub
# eg: "arn:aws:sns:eu-central-1:123456789012:"
containers:
- name: alertmanager-sns-forwarder
image: datareply/alertmanager-sns-forwarder:latest
imagePullPolicy: Always
env:
- name: SNS_FORWARDER_ARN_PREFIX
valueFrom:
fieldRef:
fieldPath: metadata.annotations['kubezero.com/sns_forwarder_ARN_PREFIX']
- name: AWS_ROLE_ARN
valueFrom:
fieldRef:
fieldPath: metadata.annotations['kubezero.com/sns_forwarder_AWS_ROLE_ARN']
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: "/var/run/secrets/sts.amazonaws.com/serviceaccount/token"
- name: AWS_STS_REGIONAL_ENDPOINTS
value: regional
volumeMounts:
- name: aws-token
mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/"
readOnly: true
resources:
limits:
memory: 64Mi
cpu: 100m
requests:
cpu: 25m
memory: 32Mi
ports:
- containerPort: 9087
name: webhook-port
livenessProbe:
httpGet:
path: /health
port: webhook-port
initialDelaySeconds: 30
timeoutSeconds: 10
readinessProbe:
httpGet:
path: /health
port: webhook-port
initialDelaySeconds: 10
timeoutSeconds: 10
volumes:
- name: aws-token
projected:
sources:
- serviceAccountToken:
path: token
expirationSeconds: 86400
audience: "sts.amazonaws.com"
# Metrics adapter
prometheus-adapter:
enabled: true

4
charts/kubezero-redis/Chart.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v2
name: kubezero-redis
description: KubeZero Umbrella Chart for Redis HA
type: application
version: 0.3.0
version: 0.3.1
home: https://kubezero.com
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
keywords:
@ -15,7 +15,7 @@ dependencies:
version: ">= 0.1.3"
repository: https://zero-down-time.github.io/kubezero/
- name: redis
version: 12.1.1
version: 14.8.8
repository: https://charts.bitnami.com/bitnami
condition: redis.enabled
- name: redis-cluster

2
charts/kubezero-redis/templates/envoyfilter-custom-redis-cluster.yaml
View File

@ -22,7 +22,7 @@ spec:
address:
socket_address:
address: {{ $.Release.Name }}-{{ $i }}.{{ $.Release.Name }}-headless.{{ $.Release.Namespace }}.svc.cluster.local
port_value: {{ index $.Values "redis-cluster" "redisPort" }}
port_value: 6379
{{- end }}
cluster_type:
name: envoy.clusters.redis

2
charts/kubezero-redis/templates/envoyfilter-redis-proxy.yaml
View File

@ -13,7 +13,7 @@ spec:
match:
context: GATEWAY
listener:
name: 0.0.0.0_{{ index .Values "redis-cluster" "redisPort" }}
name: 0.0.0.0_{{ default 6379 .Values.istio.port }}
filterChain:
filter:
name: "envoy.filters.network.tcp_proxy"

2
charts/kubezero-redis/templates/istio-authorization-policy.yaml
View File

@ -21,6 +21,6 @@ spec:
{{- end }}
to:
- operation:
ports: ["{{ default 6379 .Values.redis.redisPort }}"]
ports: ["{{ default 6379 .Values.istio.port }}"]
{{- end }}
{{- end }}

6
charts/kubezero-redis/templates/istio-service.yaml
View File

@ -13,10 +13,10 @@ spec:
- {{ .Values.istio.gateway }}
tcp:
- match:
- port: {{ default 6379 .Values.redis.redisPort }}
- port: {{ default 6379 .Values.istio.port }}
route:
- destination:
host: redis-headless
host: redis-cluster-headless
port:
number: {{ default 6379 .Values.redis.redisPort }}
number: 6379
{{- end }}

12
charts/kubezero-redis/values.yaml
View File

@ -1,12 +1,13 @@
redis:
enabled: false
redisPort: 6379
architecture: standalone
cluster:
slaveCount: 0
replica:
replicaCount: 0
usePassword: false
auth:
enabled: false
master:
persistence:
@ -20,14 +21,11 @@ redis:
enabled: false
serviceMonitor:
enabled: false
# extraArgs:
# redis.addr: "redis://localhost:6379"
redis-cluster:
enabled: false
redisPort: 6379
usePassword: false
cluster: