diff --git a/packages/rancher-aks-operator-crd/package.yaml b/packages/rancher-aks-operator-crd/package.yaml index f7b9df9c4..0031c2b65 100644 --- a/packages/rancher-aks-operator-crd/package.yaml +++ b/packages/rancher-aks-operator-crd/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/aks-operator/releases/download/v1.0.1-rc12/rancher-aks-operator-crd-1.0.1-rc12.tgz +url: https://github.com/rancher/aks-operator/releases/download/v1.0.1-rc14/rancher-aks-operator-crd-1.0.1-rc14.tgz version: 100.0.0 diff --git a/packages/rancher-aks-operator/package.yaml b/packages/rancher-aks-operator/package.yaml index d205702b1..5350d5b63 100644 --- a/packages/rancher-aks-operator/package.yaml +++ b/packages/rancher-aks-operator/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/aks-operator/releases/download/v1.0.1-rc12/rancher-aks-operator-1.0.1-rc12.tgz +url: https://github.com/rancher/aks-operator/releases/download/v1.0.1-rc14/rancher-aks-operator-1.0.1-rc14.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 b1f759d6c..0408f3e00 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,7 +1,13 @@ +@@ -1,5 +1,11 @@ +annotations: + catalog.rancher.io/certified: rancher + catalog.rancher.io/namespace: cattle-monitoring-system @@ -10,9 +10,6 @@ apiVersion: v2 -name: grafana +name: rancher-grafana - version: 6.11.0 --appVersion: 7.5.5 -+appVersion: 7.5.8 + version: 6.6.4 + appVersion: 7.4.5 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 50d29485e..7bf446713 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 -@@ -388,17 +392,17 @@ +@@ -380,17 +384,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 9dd0a08e2..5120b4b2c 100644 --- a/packages/rancher-grafana/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-grafana/generated-changes/patch/values.yaml.patch @@ -27,18 +27,16 @@ namespaced: false extraRoleRules: [] # - apiGroups: [] -@@ -68,8 +84,8 @@ +@@ -52,7 +68,7 @@ # schedulerName: "default-scheduler" image: - repository: grafana/grafana -- tag: 7.5.5 + repository: rancher/mirrored-grafana-grafana -+ tag: 7.5.8 + tag: 7.4.5 sha: "" pullPolicy: IfNotPresent - -@@ -82,12 +98,15 @@ +@@ -66,12 +82,15 @@ testFramework: enabled: true @@ -56,18 +54,16 @@ runAsUser: 472 runAsGroup: 472 fsGroup: 472 -@@ -115,8 +134,8 @@ +@@ -99,7 +118,7 @@ # priorityClassName: downloadDashboardsImage: - repository: curlimages/curl -- tag: 7.73.0 + repository: rancher/mirrored-curlimages-curl -+ tag: 7.77.0 + tag: 7.73.0 sha: "" pullPolicy: IfNotPresent - -@@ -301,7 +320,7 @@ +@@ -284,7 +303,7 @@ ## initChownData container image ## image: @@ -76,18 +72,27 @@ tag: "1.31.1" sha: "" pullPolicy: IfNotPresent -@@ -602,8 +621,8 @@ +@@ -581,7 +600,7 @@ ## 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.12.2 + tag: 1.10.7 sha: "" imagePullPolicy: IfNotPresent - resources: {} -@@ -690,9 +709,9 @@ +@@ -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 @@ replicas: 1 image: # image-renderer Image repository @@ -95,7 +100,7 @@ + repository: rancher/mirrored-grafana-grafana-image-renderer # image-renderer Image tag - tag: latest -+ tag: 3.0.1 ++ tag: 2.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 bbb109e4a..c34e71f58 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: bf7e1110a5ee9258190d0377fea319bb8e764e62 +commit: 837b4ace32278eee14310f1d654d651d0898bb19 version: 100.0.0