Bug fixes and argo tweaks
This commit is contained in:
parent
32ed7cf3a0
commit
5b317db251
@ -295,7 +295,6 @@ fluent-bit:
|
|||||||
|
|
||||||
serviceMonitor:
|
serviceMonitor:
|
||||||
enabled: true
|
enabled: true
|
||||||
namespace: monitoring
|
|
||||||
selector:
|
selector:
|
||||||
release: metrics
|
release: metrics
|
||||||
|
|
||||||
|
@ -12,6 +12,12 @@
|
|||||||
jsonPointers:
|
jsonPointers:
|
||||||
- /webhooks/0/clientConfig/caBundle
|
- /webhooks/0/clientConfig/caBundle
|
||||||
- /webhooks/0/failurePolicy
|
- /webhooks/0/failurePolicy
|
||||||
|
- group: admissionregistration.k8s.io
|
||||||
|
kind: MutatingWebhookConfiguration
|
||||||
|
jsonPointers:
|
||||||
|
- /webhooks/0/clientConfig/caBundle
|
||||||
|
- /webhooks/0/failurePolicy
|
||||||
|
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Namespace
|
kind: Namespace
|
||||||
|
@ -232,7 +232,7 @@ function istio() {
|
|||||||
#################
|
#################
|
||||||
function istio-ingress() {
|
function istio-ingress() {
|
||||||
local chart="kubezero-istio-ingress"
|
local chart="kubezero-istio-ingress"
|
||||||
local release="istio"
|
local release="istio-ingress"
|
||||||
local namespace="istio-ingress"
|
local namespace="istio-ingress"
|
||||||
|
|
||||||
local task=$1
|
local task=$1
|
||||||
@ -284,7 +284,7 @@ function logging() {
|
|||||||
local task=$1
|
local task=$1
|
||||||
|
|
||||||
if [ $task == "deploy" ]; then
|
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.*'
|
kubectl annotate --overwrite namespace logging 'iam.amazonaws.com/permitted=.*ElasticSearchSnapshots.*'
|
||||||
|
|
||||||
|
@ -222,7 +222,7 @@ logging:
|
|||||||
|
|
||||||
fluent-bit:
|
fluent-bit:
|
||||||
enabled: {{ index .Values.logging "fluent-bit" "enabled" }}
|
enabled: {{ index .Values.logging "fluent-bit" "enabled" }}
|
||||||
metrics:
|
serviceMonitor:
|
||||||
enabled: {{ .Values.metrics.enabled }}
|
enabled: {{ .Values.metrics.enabled }}
|
||||||
{{- if index .Values.logging "fluent-bit" "config" }}
|
{{- if index .Values.logging "fluent-bit" "config" }}
|
||||||
config:
|
config:
|
||||||
|
Loading…
Reference in New Issue
Block a user