diff --git a/packages/rancher-monitoring/rancher-grafana/generated-changes/overlay/templates/nginx-config.yaml b/packages/rancher-monitoring/rancher-grafana/generated-changes/overlay/templates/nginx-config.yaml index 8247383cb..472dfb495 100644 --- a/packages/rancher-monitoring/rancher-grafana/generated-changes/overlay/templates/nginx-config.yaml +++ b/packages/rancher-monitoring/rancher-grafana/generated-changes/overlay/templates/nginx-config.yaml @@ -52,7 +52,6 @@ data: sub_filter_types application/json; sub_filter_once off; - sub_filter '"url":"/d' '"url":"d'; } location /api/live/ { @@ -76,7 +75,6 @@ data: sub_filter_once off; sub_filter '"appSubUrl":""' '"appSubUrl":"/k8s/clusters/{{ .Values.global.cattle.clusterId }}/api/v1/namespaces/{{ template "grafana.namespace" . }}/services/http:{{ template "grafana.fullname" . }}:{{ .Values.service.port }}/proxy"'; - sub_filter '"url":"/' '"url":"./'; sub_filter ':"/avatar/' ':"avatar/'; if ($request_filename ~ .*\.(?:js|css|jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm)$) { diff --git a/packages/rancher-monitoring/rancher-grafana/generated-changes/patch/templates/_helpers.tpl.patch b/packages/rancher-monitoring/rancher-grafana/generated-changes/patch/templates/_helpers.tpl.patch index b95ef3e34..98e4f8d43 100644 --- a/packages/rancher-monitoring/rancher-grafana/generated-changes/patch/templates/_helpers.tpl.patch +++ b/packages/rancher-monitoring/rancher-grafana/generated-changes/patch/templates/_helpers.tpl.patch @@ -33,13 +33,10 @@ {{/* vim: set filetype=mustache: */}} {{/* Expand the name of the chart. -@@ -125,6 +154,17 @@ - {{- print "rbac.authorization.k8s.io/v1" -}} - {{- else -}} - {{- print "rbac.authorization.k8s.io/v1beta1" -}} -+ {{- end -}} -+{{- end -}} -+ +@@ -128,6 +157,17 @@ + {{- end -}} + {{- end -}} + +{{/* +Return the appropriate apiVersion for HorizontalPodAutoscaler. +*/}} @@ -48,6 +45,9 @@ + {{- print "autoscaling/v2" -}} + {{- else if .Capabilities.APIVersions.Has "autoscaling/v1" }} + {{- print "autoscaling/v1" -}} - {{- end -}} - {{- end -}} - ++ {{- end -}} ++{{- end -}} ++ + {{/* + Return the appropriate apiVersion for ingress. + */}} diff --git a/packages/rancher-monitoring/rancher-grafana/generated-changes/patch/templates/podsecuritypolicy.yaml.patch b/packages/rancher-monitoring/rancher-grafana/generated-changes/patch/templates/podsecuritypolicy.yaml.patch index 19b81c791..74f86301e 100644 --- a/packages/rancher-monitoring/rancher-grafana/generated-changes/patch/templates/podsecuritypolicy.yaml.patch +++ b/packages/rancher-monitoring/rancher-grafana/generated-changes/patch/templates/podsecuritypolicy.yaml.patch @@ -23,9 +23,8 @@ spec: privileged: false allowPrivilegeEscalation: false -@@ -47,5 +42,4 @@ - - min: 1 +@@ -48,4 +43,3 @@ max: 65535 readOnlyRootFilesystem: false --{{- end }} {{- end }} +-{{- end }} diff --git a/packages/rancher-monitoring/rancher-grafana/generated-changes/patch/templates/tests/test-podsecuritypolicy.yaml.patch b/packages/rancher-monitoring/rancher-grafana/generated-changes/patch/templates/tests/test-podsecuritypolicy.yaml.patch index 48e5afa45..11ac06ed7 100644 --- a/packages/rancher-monitoring/rancher-grafana/generated-changes/patch/templates/tests/test-podsecuritypolicy.yaml.patch +++ b/packages/rancher-monitoring/rancher-grafana/generated-changes/patch/templates/tests/test-podsecuritypolicy.yaml.patch @@ -7,9 +7,8 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: -@@ -27,5 +26,4 @@ - - projected +@@ -28,4 +27,3 @@ - csi - secret --{{- end }} {{- end }} +-{{- end }}