Bug fixes and argo tweaks

This commit is contained in:
Stefan Reimer 2020-11-24 07:18:14 -08:00
parent 32ed7cf3a0
commit 5b317db251
4 changed files with 9 additions and 4 deletions

View File

@ -295,7 +295,6 @@ fluent-bit:
serviceMonitor:
enabled: true
namespace: monitoring
selector:
release: metrics

View File

@ -12,6 +12,12 @@
jsonPointers:
- /webhooks/0/clientConfig/caBundle
- /webhooks/0/failurePolicy
- group: admissionregistration.k8s.io
kind: MutatingWebhookConfiguration
jsonPointers:
- /webhooks/0/clientConfig/caBundle
- /webhooks/0/failurePolicy
---
apiVersion: v1
kind: Namespace

View File

@ -232,7 +232,7 @@ function istio() {
#################
function istio-ingress() {
local chart="kubezero-istio-ingress"
local release="istio"
local release="istio-ingress"
local namespace="istio-ingress"
local task=$1
@ -284,7 +284,7 @@ function logging() {
local task=$1
if [ $task == "deploy" ]; then
deploy $chart $release $namespace -f $TMPDIR/values.yaml
deploy $chart $release $namespace -a "monitoring.coreos.com/v1" -f $TMPDIR/values.yaml
kubectl annotate --overwrite namespace logging 'iam.amazonaws.com/permitted=.*ElasticSearchSnapshots.*'

View File

@ -222,7 +222,7 @@ logging:
fluent-bit:
enabled: {{ index .Values.logging "fluent-bit" "enabled" }}
metrics:
serviceMonitor:
enabled: {{ .Values.metrics.enabled }}
{{- if index .Values.logging "fluent-bit" "config" }}
config: