diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 0cca7d331f..3fb857d028 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 10.0.0 +version: 10.1.0 appVersion: 12.1.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/templates/networkpolicy.yaml b/charts/grafana/templates/networkpolicy.yaml index 4cd3ed6976..5e99b0c391 100644 --- a/charts/grafana/templates/networkpolicy.yaml +++ b/charts/grafana/templates/networkpolicy.yaml @@ -24,9 +24,9 @@ spec: podSelector: matchLabels: {{- include "grafana.selectorLabels" . | nindent 6 }} - {{- if .Values.networkPolicy.egress.enabled }} egress: + {{- if not .Values.networkPolicy.egress.manualEgress }} {{- if not .Values.networkPolicy.egress.blockDNSResolution }} - ports: - port: 53 @@ -38,6 +38,9 @@ spec: to: {{- toYaml . | nindent 12 }} {{- end }} + {{- else }} + {{- toYaml .Values.networkPolicy.egress.manualEgress | nindent 4 }} + {{- end }} {{- end }} {{- if .Values.networkPolicy.ingress }} ingress: diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index 1353ff6479..394b805d5a 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -1606,12 +1606,18 @@ networkPolicy: ## to: ## - namespaceSelector: ## matchExpressions: - ## - {key: role, operator: In, values: [grafana]} - ## - ## - ## - ## - ## + ## - {key: role, operator: In, values: [grafana]} + ## + ## @param networkPolicy.egress.manualEgress Manually define all egress rules + manualEgress: [] + ## E.X. + ##- to: + ## - podSelector: + ## matchLabels: + ## app.kubernetes.io/name: other-pod + ## ports: + ## - protocol: TCP + ## port: 3000 # Enable backward compatibility of kubernetes where version below 1.13 doesn't have the enableServiceLinks option enableKubeBackwardCompatibility: false