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-original/templates/deployment.yaml
|
||||||
+++ charts/templates/deployment.yaml
|
+++ charts/templates/deployment.yaml
|
||||||
@@ -42,7 +42,7 @@
|
@@ -46,7 +46,7 @@
|
||||||
{{- end}}
|
{{- end}}
|
||||||
containers:
|
containers:
|
||||||
- name: {{ .Chart.Name }}
|
- name: {{ .Chart.Name }}
|
||||||
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
|
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
|
||||||
+ image: "{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}"
|
+ image: "{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}"
|
||||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||||
args:
|
{{- with .Values.env }}
|
||||||
- /adapter
|
env:
|
||||||
@@ -108,8 +108,10 @@
|
@@ -105,8 +105,10 @@
|
||||||
name: volume-serving-cert
|
name: volume-serving-cert
|
||||||
readOnly: true
|
readOnly: true
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
affinity:
|
affinity:
|
||||||
{{- toYaml .Values.affinity | nindent 8 }}
|
{{- toYaml .Values.affinity | nindent 8 }}
|
||||||
topologySpreadConstraints:
|
topologySpreadConstraints:
|
||||||
@@ -119,8 +121,10 @@
|
@@ -116,8 +118,10 @@
|
||||||
securityContext:
|
securityContext:
|
||||||
{{- toYaml .Values.podSecurityContext | nindent 8 }}
|
{{- toYaml .Values.podSecurityContext | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
--- charts-original/templates/psp.yaml
|
--- charts-original/templates/psp.yaml
|
||||||
+++ charts/templates/psp.yaml
|
+++ charts/templates/psp.yaml
|
||||||
@@ -1,4 +1,4 @@
|
@@ -1,4 +1,4 @@
|
||||||
-{{- if .Values.psp.create -}}
|
-{{- if and .Values.psp.create (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
|
||||||
+{{- if .Values.global.cattle.psp.enabled -}}
|
+{{- if and (or .Values.global.cattle.psp.enabled .Values.psp.create) (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
|
||||||
---
|
---
|
||||||
apiVersion: policy/v1beta1
|
apiVersion: policy/v1beta1
|
||||||
kind: PodSecurityPolicy
|
kind: PodSecurityPolicy
|
||||||
|
|
|
@ -13,19 +13,8 @@
|
||||||
topologySpreadConstraints: []
|
topologySpreadConstraints: []
|
||||||
|
|
||||||
image:
|
image:
|
||||||
- repository: k8s.gcr.io/prometheus-adapter/prometheus-adapter
|
- repository: registry.k8s.io/prometheus-adapter/prometheus-adapter
|
||||||
+ repository: rancher/mirrored-prometheus-adapter-prometheus-adapter
|
+ repository: rancher/mirrored-prometheus-adapter-prometheus-adapter
|
||||||
tag: v0.10.0
|
tag: v0.10.0
|
||||||
pullPolicy: IfNotPresent
|
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
|
url: https://github.com/prometheus-community/helm-charts.git
|
||||||
subdirectory: charts/prometheus-adapter
|
subdirectory: charts/prometheus-adapter
|
||||||
commit: a31ac6984245b6ca9739dee5e983b613255842da
|
commit: dd5f89e1aa9f1f6140ae01de27dd50f2d183346a
|
||||||
version: 103.0.0
|
version: 103.0.0
|
||||||
doNotRelease: true
|
doNotRelease: true
|
||||||
|
|
Loading…
Reference in New Issue