mirror of https://git.rancher.io/charts
Update rancher-monitoring/rancher-prometheus-adapter to new base dd5f89e1aa9f1f6140ae01de27dd50f2d183346a
parent
fe40560c0b
commit
10138cdc2c
|
@ -1,15 +1,15 @@
|
|||
--- charts-original/templates/deployment.yaml
|
||||
+++ charts/templates/deployment.yaml
|
||||
@@ -42,7 +42,7 @@
|
||||
@@ -46,7 +46,7 @@
|
||||
{{- end}}
|
||||
containers:
|
||||
- name: {{ .Chart.Name }}
|
||||
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
|
||||
+ image: "{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}"
|
||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||
args:
|
||||
- /adapter
|
||||
@@ -108,8 +108,10 @@
|
||||
{{- with .Values.env }}
|
||||
env:
|
||||
@@ -105,8 +105,10 @@
|
||||
name: volume-serving-cert
|
||||
readOnly: true
|
||||
{{- end }}
|
||||
|
@ -22,7 +22,7 @@
|
|||
affinity:
|
||||
{{- toYaml .Values.affinity | nindent 8 }}
|
||||
topologySpreadConstraints:
|
||||
@@ -119,8 +121,10 @@
|
||||
@@ -116,8 +118,10 @@
|
||||
securityContext:
|
||||
{{- toYaml .Values.podSecurityContext | nindent 8 }}
|
||||
{{- end }}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
--- charts-original/templates/psp.yaml
|
||||
+++ charts/templates/psp.yaml
|
||||
@@ -1,4 +1,4 @@
|
||||
-{{- if .Values.psp.create -}}
|
||||
+{{- if .Values.global.cattle.psp.enabled -}}
|
||||
-{{- if and .Values.psp.create (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
|
||||
+{{- if and (or .Values.global.cattle.psp.enabled .Values.psp.create) (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
|
||||
---
|
||||
apiVersion: policy/v1beta1
|
||||
kind: PodSecurityPolicy
|
||||
|
|
|
@ -13,19 +13,8 @@
|
|||
topologySpreadConstraints: []
|
||||
|
||||
image:
|
||||
- repository: k8s.gcr.io/prometheus-adapter/prometheus-adapter
|
||||
- repository: registry.k8s.io/prometheus-adapter/prometheus-adapter
|
||||
+ repository: rancher/mirrored-prometheus-adapter-prometheus-adapter
|
||||
tag: v0.10.0
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
@@ -49,10 +56,6 @@
|
||||
# Specifies whether RBAC resources should be created
|
||||
create: true
|
||||
|
||||
-psp:
|
||||
- # Specifies whether PSP resources should be created
|
||||
- create: false
|
||||
-
|
||||
serviceAccount:
|
||||
# Specifies whether a service account should be created
|
||||
create: true
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
url: https://github.com/prometheus-community/helm-charts.git
|
||||
subdirectory: charts/prometheus-adapter
|
||||
commit: a31ac6984245b6ca9739dee5e983b613255842da
|
||||
commit: dd5f89e1aa9f1f6140ae01de27dd50f2d183346a
|
||||
version: 103.0.0
|
||||
doNotRelease: true
|
||||
|
|
Loading…
Reference in New Issue