From aab61c998f73fcd74fde6f9c032c14c6d6c6ad79 Mon Sep 17 00:00:00 2001 From: Donnie Adams Date: Mon, 28 Jun 2021 17:09:01 -0700 Subject: [PATCH] (dev-v2.6-archive) Bump eks-operator chart to 1.1.1-rc5 (partially cherry picked from commit 67d3035dced20e20412cf52de04caeec457540b6) --- .../rancher-eks-operator-crd/package.yaml | 2 +- packages/rancher-eks-operator/package.yaml | 2 +- .../rancher-gke-operator-crd/package.yaml | 2 +- packages/rancher-gke-operator/package.yaml | 2 +- .../generated-changes/patch/Chart.yaml.patch | 9 +++-- .../patch/templates/_pod.tpl.patch | 2 +- .../generated-changes/patch/values.yaml.patch | 37 ++++++++----------- packages/rancher-grafana/package.yaml | 2 +- 8 files changed, 28 insertions(+), 30 deletions(-) diff --git a/packages/rancher-eks-operator-crd/package.yaml b/packages/rancher-eks-operator-crd/package.yaml index fbebfafb9..be2c62d0a 100644 --- a/packages/rancher-eks-operator-crd/package.yaml +++ b/packages/rancher-eks-operator-crd/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/eks-operator/releases/download/v1.1.1-rc4/rancher-eks-operator-crd-1.1.1-rc4.tgz +url: https://github.com/rancher/eks-operator/releases/download/v1.1.1-rc5/rancher-eks-operator-crd-1.1.1-rc5.tgz version: 100.0.0 diff --git a/packages/rancher-eks-operator/package.yaml b/packages/rancher-eks-operator/package.yaml index 7e7a9d837..342827cdf 100644 --- a/packages/rancher-eks-operator/package.yaml +++ b/packages/rancher-eks-operator/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/eks-operator/releases/download/v1.1.1-rc4/rancher-eks-operator-1.1.1-rc4.tgz +url: https://github.com/rancher/eks-operator/releases/download/v1.1.1-rc5/rancher-eks-operator-1.1.1-rc5.tgz version: 100.0.0 diff --git a/packages/rancher-gke-operator-crd/package.yaml b/packages/rancher-gke-operator-crd/package.yaml index 1f09c8d1c..350f0034e 100644 --- a/packages/rancher-gke-operator-crd/package.yaml +++ b/packages/rancher-gke-operator-crd/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/gke-operator/releases/download/v1.1.1-rc6/rancher-gke-operator-crd-1.1.1-rc6.tgz +url: https://github.com/rancher/gke-operator/releases/download/v1.1.1-rc5/rancher-gke-operator-crd-1.1.1-rc5.tgz version: 100.0.0 diff --git a/packages/rancher-gke-operator/package.yaml b/packages/rancher-gke-operator/package.yaml index 823b261cc..f54935a7d 100644 --- a/packages/rancher-gke-operator/package.yaml +++ b/packages/rancher-gke-operator/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/gke-operator/releases/download/v1.1.1-rc6/rancher-gke-operator-1.1.1-rc6.tgz +url: https://github.com/rancher/gke-operator/releases/download/v1.1.1-rc5/rancher-gke-operator-1.1.1-rc5.tgz version: 100.0.0 diff --git a/packages/rancher-grafana/generated-changes/patch/Chart.yaml.patch b/packages/rancher-grafana/generated-changes/patch/Chart.yaml.patch index 0408f3e00..b1f759d6c 100644 --- a/packages/rancher-grafana/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-grafana/generated-changes/patch/Chart.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/Chart.yaml +++ charts/Chart.yaml -@@ -1,5 +1,11 @@ +@@ -1,7 +1,13 @@ +annotations: + catalog.rancher.io/certified: rancher + catalog.rancher.io/namespace: cattle-monitoring-system @@ -10,6 +10,9 @@ apiVersion: v2 -name: grafana +name: rancher-grafana - version: 6.6.4 - appVersion: 7.4.5 + version: 6.11.0 +-appVersion: 7.5.5 ++appVersion: 7.5.8 kubeVersion: '^1.8.0-0' + description: The leading tool for querying and visualizing time series and metrics. + home: https://grafana.net diff --git a/packages/rancher-grafana/generated-changes/patch/templates/_pod.tpl.patch b/packages/rancher-grafana/generated-changes/patch/templates/_pod.tpl.patch index 7bf446713..50d29485e 100644 --- a/packages/rancher-grafana/generated-changes/patch/templates/_pod.tpl.patch +++ b/packages/rancher-grafana/generated-changes/patch/templates/_pod.tpl.patch @@ -93,7 +93,7 @@ protocol: TCP - name: {{ .Values.podPortName }} containerPort: 3000 -@@ -380,17 +384,17 @@ +@@ -388,17 +392,17 @@ {{- with .Values.extraContainers }} {{ tpl . $ | indent 2 }} {{- end }} diff --git a/packages/rancher-grafana/generated-changes/patch/values.yaml.patch b/packages/rancher-grafana/generated-changes/patch/values.yaml.patch index 5120b4b2c..9dd0a08e2 100644 --- a/packages/rancher-grafana/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-grafana/generated-changes/patch/values.yaml.patch @@ -27,16 +27,18 @@ namespaced: false extraRoleRules: [] # - apiGroups: [] -@@ -52,7 +68,7 @@ +@@ -68,8 +84,8 @@ # schedulerName: "default-scheduler" image: - repository: grafana/grafana +- tag: 7.5.5 + repository: rancher/mirrored-grafana-grafana - tag: 7.4.5 ++ tag: 7.5.8 sha: "" pullPolicy: IfNotPresent -@@ -66,12 +82,15 @@ + +@@ -82,12 +98,15 @@ testFramework: enabled: true @@ -54,16 +56,18 @@ runAsUser: 472 runAsGroup: 472 fsGroup: 472 -@@ -99,7 +118,7 @@ +@@ -115,8 +134,8 @@ # priorityClassName: downloadDashboardsImage: - repository: curlimages/curl +- tag: 7.73.0 + repository: rancher/mirrored-curlimages-curl - tag: 7.73.0 ++ tag: 7.77.0 sha: "" pullPolicy: IfNotPresent -@@ -284,7 +303,7 @@ + +@@ -301,7 +320,7 @@ ## initChownData container image ## image: @@ -72,27 +76,18 @@ tag: "1.31.1" sha: "" pullPolicy: IfNotPresent -@@ -581,7 +600,7 @@ +@@ -602,8 +621,8 @@ ## Requires at least Grafana 5 to work and can't be used together with parameters dashboardProviders, datasources and dashboards sidecar: image: - repository: quay.io/kiwigrid/k8s-sidecar +- tag: 1.10.7 + repository: rancher/mirrored-kiwigrid-k8s-sidecar - tag: 1.10.7 ++ tag: 1.12.2 sha: "" imagePullPolicy: IfNotPresent -@@ -639,6 +658,10 @@ - # Otherwise the namespace in which the sidecar is running will be used. - # It's also possible to specify ALL to search in all namespaces - searchNamespace: null -+ -+ ## The name of a secret in the same kubernetes namespace which contain values to be added to the environment -+ ## This can be useful for database passwords, etc. Value is templated. -+ envFromSecret: "" - notifiers: - enabled: false - # label that the configmaps with notifiers are marked with -@@ -663,9 +686,9 @@ + resources: {} +@@ -690,9 +709,9 @@ replicas: 1 image: # image-renderer Image repository @@ -100,7 +95,7 @@ + repository: rancher/mirrored-grafana-grafana-image-renderer # image-renderer Image tag - tag: latest -+ tag: 2.0.1 ++ tag: 3.0.1 # image-renderer Image sha (optional) sha: "" # image-renderer ImagePullPolicy diff --git a/packages/rancher-grafana/package.yaml b/packages/rancher-grafana/package.yaml index c34e71f58..bbb109e4a 100644 --- a/packages/rancher-grafana/package.yaml +++ b/packages/rancher-grafana/package.yaml @@ -1,4 +1,4 @@ url: https://github.com/grafana/helm-charts.git subdirectory: charts/grafana -commit: 837b4ace32278eee14310f1d654d651d0898bb19 +commit: bf7e1110a5ee9258190d0377fea319bb8e764e62 version: 100.0.0