mirror of https://git.rancher.io/charts
(dev-v2.6-archive) Change eks-operator version to v1.1.1
(partially cherry picked from commit 8d7f56d799)
pull/1680/head
Donnie Adams
Arvind Iyengar
parent
05c3912de8
commit
6b385a97b9
|
|
@ -1,12 +0,0 @@
|
|||
--- charts-original/Chart.yaml
|
||||
+++ charts/Chart.yaml
|
||||
@@ -5,7 +5,7 @@
|
||||
catalog.cattle.io/os: linux
|
||||
catalog.cattle.io/release-name: rancher-eks-operator-crd
|
||||
apiVersion: v2
|
||||
-appVersion: 2.0.1-rc1
|
||||
+appVersion: 2.0.1
|
||||
description: EKS Operator CustomResourceDefinitions
|
||||
name: rancher-eks-operator-crd
|
||||
-version: 2.0.1-rc1
|
||||
+version: 2.0.1
|
||||
|
|
@ -1,2 +1,2 @@
|
|||
url: https://github.com/rancher/eks-operator/releases/download/v2.0.1-rc1/rancher-eks-operator-crd-2.0.1-rc1.tgz
|
||||
url: https://github.com/rancher/eks-operator/releases/download/v1.1.1-rc1/rancher-eks-operator-crd-1.1.1-rc1.tgz
|
||||
packageVersion: 0
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
--- charts-original/Chart.yaml
|
||||
+++ charts/Chart.yaml
|
||||
@@ -9,10 +9,10 @@
|
||||
catalog.cattle.io/release-name: rancher-eks-operator
|
||||
catalog.cattle.io/scope: management
|
||||
apiVersion: v2
|
||||
-appVersion: 2.0.1-rc1
|
||||
+appVersion: 2.0.1
|
||||
description: A Helm chart for provisioning EKS clusters
|
||||
home: https://github.com/rancher/eks-operator
|
||||
name: rancher-eks-operator
|
||||
sources:
|
||||
- https://github.com/rancher/eks-operator
|
||||
-version: 2.0.1-rc1
|
||||
+version: 2.0.1
|
||||
|
|
@ -1,2 +1,2 @@
|
|||
url: https://github.com/rancher/eks-operator/releases/download/v2.0.1-rc1/rancher-eks-operator-2.0.1-rc1.tgz
|
||||
url: https://github.com/rancher/eks-operator/releases/download/v1.1.1-rc1/rancher-eks-operator-1.1.1-rc1.tgz
|
||||
packageVersion: 0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- charts-original/values.yaml
|
||||
+++ charts/values.yaml
|
||||
@@ -2,13 +2,279 @@
|
||||
@@ -2,13 +2,278 @@
|
||||
# This is a YAML-formatted file.
|
||||
# Declare variables to be passed into your templates.
|
||||
|
||||
|
|
@ -225,10 +225,9 @@
|
|||
+ nodeSelector:
|
||||
+ node-role.kubernetes.io/etcd: "true"
|
||||
+ tolerations:
|
||||
+ - effect: "NoExecute"
|
||||
+ operator: "Exists"
|
||||
+ - effect: "NoSchedule"
|
||||
+ operator: "Exists"
|
||||
+ key: node-role.kubernetes.io/master
|
||||
+ operator: "Equal"
|
||||
+
|
||||
+## Component scraping nginx-ingress-controller
|
||||
+##
|
||||
|
|
@ -282,7 +281,7 @@
|
|||
|
||||
## Provide a k8s version to auto dashboard import script example: kubeTargetVersionOverride: 1.16.6
|
||||
##
|
||||
@@ -89,8 +355,32 @@
|
||||
@@ -89,8 +354,32 @@
|
||||
|
||||
##
|
||||
global:
|
||||
|
|
@ -315,7 +314,7 @@
|
|||
pspEnabled: true
|
||||
pspAnnotations: {}
|
||||
## Specify pod annotations
|
||||
@@ -143,6 +433,22 @@
|
||||
@@ -143,6 +432,22 @@
|
||||
## ref: https://prometheus.io/docs/alerting/configuration/#configuration-file
|
||||
## https://prometheus.io/webtools/alerting/routing-tree-editor/
|
||||
##
|
||||
|
|
@ -338,7 +337,7 @@
|
|||
config:
|
||||
global:
|
||||
resolve_timeout: 5m
|
||||
@@ -179,25 +485,76 @@
|
||||
@@ -179,25 +484,76 @@
|
||||
## ref: https://prometheus.io/docs/alerting/notifications/
|
||||
## https://prometheus.io/docs/alerting/notification_examples/
|
||||
##
|
||||
|
|
@ -434,7 +433,7 @@
|
|||
|
||||
ingress:
|
||||
enabled: false
|
||||
@@ -235,6 +592,25 @@
|
||||
@@ -235,6 +591,25 @@
|
||||
## Configuration for Alertmanager secret
|
||||
##
|
||||
secret:
|
||||
|
|
@ -460,7 +459,7 @@
|
|||
annotations: {}
|
||||
|
||||
## Configuration for creating an Ingress that will map to each Alertmanager replica service
|
||||
@@ -352,7 +728,7 @@
|
||||
@@ -352,7 +727,7 @@
|
||||
## Of type: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#tlsconfig
|
||||
tlsConfig: {}
|
||||
|
||||
|
|
@ -469,7 +468,7 @@
|
|||
|
||||
## metric relabel configs to apply to samples before ingestion.
|
||||
##
|
||||
@@ -383,7 +759,7 @@
|
||||
@@ -383,7 +758,7 @@
|
||||
## Image of Alertmanager
|
||||
##
|
||||
image:
|
||||
|
|
@ -478,7 +477,7 @@
|
|||
tag: v0.21.0
|
||||
sha: ""
|
||||
|
||||
@@ -495,9 +871,13 @@
|
||||
@@ -495,9 +870,13 @@
|
||||
## Define resources requests and limits for single Pods.
|
||||
## ref: https://kubernetes.io/docs/user-guide/compute-resources/
|
||||
##
|
||||
|
|
@ -495,7 +494,7 @@
|
|||
|
||||
## Pod anti-affinity can prevent the scheduler from placing Prometheus replicas on the same node.
|
||||
## The default value "soft" means that the scheduler should *prefer* to not schedule two replica pods onto the same node but no guarantee is provided.
|
||||
@@ -601,10 +981,46 @@
|
||||
@@ -601,10 +980,46 @@
|
||||
enabled: true
|
||||
namespaceOverride: ""
|
||||
|
||||
|
|
@ -542,7 +541,7 @@
|
|||
adminPassword: prom-operator
|
||||
|
||||
ingress:
|
||||
@@ -644,6 +1060,7 @@
|
||||
@@ -644,6 +1059,7 @@
|
||||
dashboards:
|
||||
enabled: true
|
||||
label: grafana_dashboard
|
||||
|
|
@ -550,7 +549,7 @@
|
|||
|
||||
## Annotations for Grafana dashboard configmaps
|
||||
##
|
||||
@@ -692,7 +1109,60 @@
|
||||
@@ -692,7 +1108,60 @@
|
||||
## Passed to grafana subchart and used by servicemonitor below
|
||||
##
|
||||
service:
|
||||
|
|
@ -612,7 +611,7 @@
|
|||
|
||||
## If true, create a serviceMonitor for grafana
|
||||
##
|
||||
@@ -722,6 +1192,14 @@
|
||||
@@ -722,6 +1191,14 @@
|
||||
# targetLabel: nodename
|
||||
# replacement: $1
|
||||
# action: replace
|
||||
|
|
@ -627,7 +626,7 @@
|
|||
|
||||
## Component scraping the kube api server
|
||||
##
|
||||
@@ -879,7 +1357,7 @@
|
||||
@@ -879,7 +1356,7 @@
|
||||
## Component scraping the kube controller manager
|
||||
##
|
||||
kubeControllerManager:
|
||||
|
|
@ -636,7 +635,7 @@
|
|||
|
||||
## If your kube controller manager is not deployed as a pod, specify IPs it can be found on
|
||||
##
|
||||
@@ -1014,7 +1492,7 @@
|
||||
@@ -1014,7 +1491,7 @@
|
||||
## Component scraping etcd
|
||||
##
|
||||
kubeEtcd:
|
||||
|
|
@ -645,7 +644,7 @@
|
|||
|
||||
## If your etcd is not deployed as a pod, specify IPs it can be found on
|
||||
##
|
||||
@@ -1076,7 +1554,7 @@
|
||||
@@ -1076,7 +1553,7 @@
|
||||
## Component scraping kube scheduler
|
||||
##
|
||||
kubeScheduler:
|
||||
|
|
@ -654,7 +653,7 @@
|
|||
|
||||
## If your kube scheduler is not deployed as a pod, specify IPs it can be found on
|
||||
##
|
||||
@@ -1131,7 +1609,7 @@
|
||||
@@ -1131,7 +1608,7 @@
|
||||
## Component scraping kube proxy
|
||||
##
|
||||
kubeProxy:
|
||||
|
|
@ -663,7 +662,7 @@
|
|||
|
||||
## If your kube proxy is not deployed as a pod, specify IPs it can be found on
|
||||
##
|
||||
@@ -1210,6 +1688,13 @@
|
||||
@@ -1210,6 +1687,13 @@
|
||||
create: true
|
||||
podSecurityPolicy:
|
||||
enabled: true
|
||||
|
|
@ -677,7 +676,7 @@
|
|||
|
||||
## Deploy node exporter as a daemonset to all nodes
|
||||
##
|
||||
@@ -1259,6 +1744,16 @@
|
||||
@@ -1259,6 +1743,16 @@
|
||||
extraArgs:
|
||||
- --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/.+)($|/)
|
||||
- --collector.filesystem.ignored-fs-types=^(autofs|binfmt_misc|bpf|cgroup2?|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs|tracefs)$
|
||||
|
|
@ -694,7 +693,7 @@
|
|||
|
||||
## Manages Prometheus and Alertmanager components
|
||||
##
|
||||
@@ -1271,8 +1766,8 @@
|
||||
@@ -1271,8 +1765,8 @@
|
||||
enabled: true
|
||||
# Value must match version names from https://golang.org/pkg/crypto/tls/#pkg-constants
|
||||
tlsMinVersion: VersionTLS13
|
||||
|
|
@ -705,7 +704,7 @@
|
|||
|
||||
## Admission webhook support for PrometheusRules resources added in Prometheus Operator 0.30 can be enabled to prevent incorrectly formatted
|
||||
## rules from making their way into prometheus and potentially preventing the container from starting
|
||||
@@ -1289,7 +1784,7 @@
|
||||
@@ -1289,7 +1783,7 @@
|
||||
patch:
|
||||
enabled: true
|
||||
image:
|
||||
|
|
@ -714,7 +713,7 @@
|
|||
tag: v1.5.0
|
||||
sha: ""
|
||||
pullPolicy: IfNotPresent
|
||||
@@ -1428,13 +1923,13 @@
|
||||
@@ -1428,13 +1922,13 @@
|
||||
|
||||
## Resource limits & requests
|
||||
##
|
||||
|
|
@ -735,7 +734,7 @@
|
|||
|
||||
# Required for use in managed kubernetes clusters (such as AWS EKS) with custom CNI (such as calico),
|
||||
# because control-plane managed by AWS cannot communicate with pods' IP CIDR and admission webhooks are not working
|
||||
@@ -1487,7 +1982,7 @@
|
||||
@@ -1487,7 +1981,7 @@
|
||||
## Prometheus-operator image
|
||||
##
|
||||
image:
|
||||
|
|
@ -744,7 +743,7 @@
|
|||
tag: v0.46.0
|
||||
sha: ""
|
||||
pullPolicy: IfNotPresent
|
||||
@@ -1503,7 +1998,7 @@
|
||||
@@ -1503,7 +1997,7 @@
|
||||
## Prometheus-config-reloader image to use for config and rule reloading
|
||||
##
|
||||
prometheusConfigReloaderImage:
|
||||
|
|
@ -753,7 +752,7 @@
|
|||
tag: v0.46.0
|
||||
sha: ""
|
||||
|
||||
@@ -1558,6 +2053,14 @@
|
||||
@@ -1558,6 +2052,14 @@
|
||||
##
|
||||
nodePort: 30901
|
||||
|
||||
|
|
@ -768,7 +767,7 @@
|
|||
## Configuration for Prometheus service
|
||||
##
|
||||
service:
|
||||
@@ -1570,7 +2073,7 @@
|
||||
@@ -1570,7 +2072,7 @@
|
||||
port: 9090
|
||||
|
||||
## To be used with a proxy extraContainer port
|
||||
|
|
@ -777,7 +776,7 @@
|
|||
|
||||
## List of IP addresses at which the Prometheus server service is available
|
||||
## Ref: https://kubernetes.io/docs/user-guide/services/#external-ips
|
||||
@@ -1822,7 +2325,7 @@
|
||||
@@ -1822,7 +2324,7 @@
|
||||
## Image of Prometheus.
|
||||
##
|
||||
image:
|
||||
|
|
@ -786,7 +785,7 @@
|
|||
tag: v2.24.0
|
||||
sha: ""
|
||||
|
||||
@@ -1885,6 +2388,11 @@
|
||||
@@ -1885,6 +2387,11 @@
|
||||
##
|
||||
externalUrl: ""
|
||||
|
||||
|
|
@ -798,7 +797,7 @@
|
|||
## Define which Nodes the Pods are scheduled on.
|
||||
## ref: https://kubernetes.io/docs/user-guide/node-selection/
|
||||
##
|
||||
@@ -1917,7 +2425,7 @@
|
||||
@@ -1917,7 +2424,7 @@
|
||||
## prometheus resource to be created with selectors based on values in the helm deployment,
|
||||
## which will also match the PrometheusRule resources created
|
||||
##
|
||||
|
|
@ -807,7 +806,7 @@
|
|||
|
||||
## PrometheusRules to be selected for target discovery.
|
||||
## If {}, select all PrometheusRules
|
||||
@@ -1942,7 +2450,7 @@
|
||||
@@ -1942,7 +2449,7 @@
|
||||
## prometheus resource to be created with selectors based on values in the helm deployment,
|
||||
## which will also match the servicemonitors created
|
||||
##
|
||||
|
|
@ -816,7 +815,7 @@
|
|||
|
||||
## ServiceMonitors to be selected for target discovery.
|
||||
## If {}, select all ServiceMonitors
|
||||
@@ -1965,7 +2473,7 @@
|
||||
@@ -1965,7 +2472,7 @@
|
||||
## prometheus resource to be created with selectors based on values in the helm deployment,
|
||||
## which will also match the podmonitors created
|
||||
##
|
||||
|
|
@ -825,7 +824,7 @@
|
|||
|
||||
## PodMonitors to be selected for target discovery.
|
||||
## If {}, select all PodMonitors
|
||||
@@ -2092,9 +2600,13 @@
|
||||
@@ -2092,9 +2599,13 @@
|
||||
|
||||
## Resource limits & requests
|
||||
##
|
||||
|
|
@ -842,7 +841,7 @@
|
|||
|
||||
## Prometheus StorageSpec for persistent data
|
||||
## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/storage.md
|
||||
@@ -2117,7 +2629,13 @@
|
||||
@@ -2117,7 +2628,13 @@
|
||||
# medium: Memory
|
||||
|
||||
# Additional volumes on the output StatefulSet definition.
|
||||
|
|
@ -857,7 +856,7 @@
|
|||
|
||||
# Additional VolumeMounts on the output StatefulSet definition.
|
||||
volumeMounts: []
|
||||
@@ -2224,9 +2742,34 @@
|
||||
@@ -2224,9 +2741,34 @@
|
||||
##
|
||||
thanos: {}
|
||||
|
||||
|
|
@ -893,7 +892,7 @@
|
|||
|
||||
## InitContainers allows injecting additional initContainers. This is meant to allow doing some changes
|
||||
## (permissions, dir tree) on mounted volumes before starting prometheus
|
||||
@@ -2234,7 +2777,7 @@
|
||||
@@ -2234,7 +2776,7 @@
|
||||
|
||||
## PortName to use for Prometheus.
|
||||
##
|
||||
|
|
|
|||
Loading…
Reference in New Issue