andata
/
rancher-charts
mirror of https://git.rancher.io/charts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(dev-v2.6-archive) Merge pull request #1440 from manuelbuil/dev-v2.6-sriov 

Move sriov chart to version to 100.x.x

(partially cherry picked from commit f94608f5ff)
pull/1680/head
Caleb Bron 2021-08-26 11:46:57 -07:00 committed by Arvind Iyengar
parent 3829485a10
commit 098745d39b
No known key found for this signature in database
GPG Key ID: A8DD9BFD6C811498
10 changed files with 105 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/rancher-backup-crd/package.yaml
View File

@ -1,2 +1,2 @@
url: https://github.com/rancher/backup-restore-operator/releases/download/v2.0.0-rc10/rancher-backup-crd-2.0.0-rc10.tgz
url: https://github.com/rancher/backup-restore-operator/releases/download/v2.0.0-rc11/rancher-backup-crd-2.0.0-rc11.tgz
version: 2.0.0

2
packages/rancher-backup/package.yaml
View File

@ -1,2 +1,2 @@
url: https://github.com/rancher/backup-restore-operator/releases/download/v2.0.0-rc10/rancher-backup-2.0.0-rc10.tgz
url: https://github.com/rancher/backup-restore-operator/releases/download/v2.0.0-rc11/rancher-backup-2.0.0-rc11.tgz
version: 2.0.0

13
packages/rancher-logging/generated-changes/patch/templates/_helpers.tpl.patch
View File

@ -1,6 +1,6 @@
--- charts-original/templates/_helpers.tpl
+++ charts/templates/_helpers.tpl
@@ -56,3 +56,92 @@
@@ -56,3 +56,101 @@
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}
@ -14,13 +14,22 @@
+{{- end -}}
+
+{{- define "windowsEnabled" }}
+{{ $windowsEnabled := false }}
+{{- if not (kindIs "invalid" .Values.global.cattle.windows) }}
+{{- if not (kindIs "invalid" .Values.global.cattle.windows.enabled) }}
+{{- if .Values.global.cattle.windows.enabled }}
+true
+{{- $windowsEnabled = true }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- if not (kindIs "invalid" .Values.rke2Windows) }}
+{{- if not (kindIs "invalid" .Values.rke2Windows.enabled) }}
+{{- if .Values.rke2Windows.enabled }}
+{{- $windowsEnabled = true }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{ $windowsEnabled }}
+{{- end }}
+
+{{- define "windowsPathPrefix" -}}

15
packages/rancher-logging/generated-changes/patch/values.yaml.patch
View File

@ -36,7 +36,7 @@
rbac:
enabled: true
psp:
@@ -95,3 +103,109 @@
@@ -95,3 +103,117 @@
additionalLabels: {}
metricRelabelings: []
relabelings: []
@ -131,9 +131,10 @@
+ cattle:
+ systemDefaultRegistry: ""
+ # Uncomment the below two lines to either enable or disable Windows logging. If this chart is
+ # installed via the Rancher UI, it will set this value to "true" if the cluster is a Windows
+ # installed via the Rancher UI, it will set this value to "true" if the cluster is an RKE1 Windows
+ # cluster. In that scenario, if you would like to disable Windows logging on Windows clusters,
+ # set the value below to "false".
+ # set both this value below and rke2Windows.enabled to false.
+ #
+ # windows:
+ # enabled: true
+ # Change the "dockerRootDirectory" if the default Docker directory has changed.
@ -146,3 +147,11 @@
+ rkeWindowsPathPrefix: "c:\\"
+ seLinux:
+ enabled: false
+
+# Uncomment the below two lines to either enable or disable Windows logging. If this chart is
+# installed via the Rancher UI, you will be able to set this value in an RKE2 Windows
+# cluster. In that scenario, if you would like to disable Windows logging on Windows clusters,
+# set this value below to false.
+# rke2Windows:
+# enabled: false
\ No newline at end of file

0
packages/rancher-monitoring/generated-changes/dependencies/windowsExporter/dependency.yaml → packages/rancher-monitoring/generated-changes/dependencies/rke2Windows/dependency.yaml
View File

2
packages/rancher-monitoring/generated-changes/dependencies/rkeWindows/dependency.yaml Normal file
View File

@ -0,0 +1,2 @@
workingDir: ""
url: packages/rancher-windows-exporter

94
packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch
View File

@ -1,47 +1,9 @@
--- charts-original/Chart.yaml
+++ charts/Chart.yaml
@@ -1,3 +1,35 @@
+apiVersion: v2
+description: Collects several related Helm charts, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator.
+icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
+engine: gotpl
+type: application
+maintainers:
+ - name: vsliouniaev
+ - name: bismarck
+ - name: gianrubio
+ email: gianrubio@gmail.com
+ - name: gkarthiks
+ email: github.gkarthiks@gmail.com
+ - name: scottrigby
+ email: scott@r6by.com
+ - name: Xtigyro
+ email: miroslav.hadzhiev@gmail.com
+ - name: Arvind
+ email: arvind.iyengar@suse.com
+ url: ""
+name: rancher-monitoring
+sources:
+ - https://github.com/prometheus-community/helm-charts
+ - https://github.com/prometheus-operator/kube-prometheus
+version: 16.6.0
+appVersion: 0.48.0
+kubeVersion: ">=1.16.0-0"
+home: https://github.com/prometheus-operator/kube-prometheus
+keywords:
+- operator
+- prometheus
+- kube-prometheus
+- monitoring
annotations:
artifacthub.io/links: |
- name: Chart Source
@@ -5,8 +37,16 @@
@@ -5,6 +5,16 @@
- name: Upstream Project
url: https://github.com/prometheus-operator/kube-prometheus
artifacthub.io/operator: "true"
-apiVersion: v2
-appVersion: 0.48.0
+ catalog.cattle.io/certified: rancher
+ catalog.cattle.io/namespace: cattle-monitoring-system
+ catalog.cattle.io/release-name: rancher-monitoring
@ -52,42 +14,38 @@
+ catalog.cattle.io/auto-install: rancher-monitoring-crd=match
+ catalog.cattle.io/requests-cpu: "4500m"
+ catalog.cattle.io/requests-memory: "4000Mi"
apiVersion: v2
appVersion: 0.48.0
dependencies:
- condition: grafana.enabled
name: grafana
@@ -71,34 +111,6 @@
@@ -74,19 +84,17 @@
- condition: rkeScheduler.enabled
name: rkeScheduler
repository: file://./charts/rkeScheduler
-- condition: windowsExporter.enabled
-- condition: rkeWindows.enabled
+- condition: global.cattle.windows.enabled
name: windowsExporter
repository: file://./charts/windowsExporter
name: rkeWindows
repository: file://./charts/rkeWindows
-description: kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards,
- and Prometheus rules combined with documentation and scripts to provide easy to
- operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus
- Operator.
-home: https://github.com/prometheus-operator/kube-prometheus
-icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
-keywords:
-- operator
-- prometheus
-- kube-prometheus
-kubeVersion: '>=1.16.0-0'
-maintainers:
-- name: vsliouniaev
-- name: bismarck
-- email: gianrubio@gmail.com
- name: gianrubio
-- email: github.gkarthiks@gmail.com
- name: gkarthiks
-- email: scott@r6by.com
- name: scottrigby
-- email: miroslav.hadzhiev@gmail.com
- name: Xtigyro
+description: Collects several related Helm charts, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator.
home: https://github.com/prometheus-operator/kube-prometheus
icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
keywords:
- operator
- prometheus
- kube-prometheus
+- monitoring
kubeVersion: '>=1.16.0-0'
maintainers:
- name: vsliouniaev
@@ -99,7 +107,7 @@
name: scottrigby
- email: miroslav.hadzhiev@gmail.com
name: Xtigyro
-name: kube-prometheus-stack
-sources:
-- https://github.com/prometheus-community/helm-charts
-- https://github.com/prometheus-operator/kube-prometheus
-type: application
-version: 16.6.0
+name: rancher-monitoring
sources:
- https://github.com/prometheus-community/helm-charts
- https://github.com/prometheus-operator/kube-prometheus

90
packages/rancher-monitoring/generated-changes/patch/values.yaml.patch
View File

@ -1,6 +1,6 @@
--- charts-original/values.yaml
+++ charts/values.yaml
@@ -2,13 +2,427 @@
@@ -2,13 +2,436 @@
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
@ -19,7 +19,7 @@
+ create: true
+
+## RKE PushProx Monitoring
+## ref: https://github.com/rancher/charts/tree/dev-v2.5-source/packages/rancher-pushprox
+## ref: https://github.com/rancher/charts/tree/release-v2.6/charts/rancher-pushprox
+##
+rkeControllerManager:
+ enabled: false
@ -100,7 +100,7 @@
+ node-role.kubernetes.io/worker: "true"
+
+## k3s PushProx Monitoring
+## ref: https://github.com/rancher/charts/tree/dev-v2.5-source/packages/rancher-pushprox
+## ref: https://github.com/rancher/charts/tree/release-v2.6/charts/rancher-pushprox
+##
+k3sServer:
+ enabled: false
@ -146,7 +146,7 @@
+ targetLabel: metrics_path
+
+## KubeADM PushProx Monitoring
+## ref: https://github.com/rancher/charts/tree/dev-v2.5-source/packages/rancher-pushprox
+## ref: https://github.com/rancher/charts/tree/release-v2.6/charts/rancher-pushprox
+##
+kubeAdmControllerManager:
+ enabled: false
@ -214,8 +214,8 @@
+ - effect: "NoSchedule"
+ operator: "Exists"
+
+## rke2 PushProx Monitoring
+## ref: https://github.com/rancher/charts/tree/dev-v2.5-source/packages/rancher-pushprox
+## RKE2 PushProx Monitoring
+## ref: https://github.com/rancher/charts/tree/release-v2.6/charts/rancher-pushprox
+##
+rke2ControllerManager:
+ enabled: false
@ -306,10 +306,19 @@
+ enabled: false
+ replicas: 1
+
+
+## RKE2 Windows Monitoring
+## ref: https://github.com/rancher/charts/tree/release-v2.6/charts/rancher-windows-exporter
+##
+## Deploys a DaemonSet of Prometheus exporters based on https://github.com/prometheus-community/windows_exporter.
+## Every Windows host must have a wins version of 0.1.0+ to use this chart (default as of Rancher 2.5.8).
+## To upgrade wins versions on Windows hosts, see https://github.com/rancher/wins/tree/master/charts/rancher-wins-upgrader.
+##
+rke2Windows:
+ ## Do not enable this value if global.cattle.windows.enabled=true
+ enabled: false
+
+## Additional PushProx Monitoring
+## ref: https://github.com/rancher/charts/tree/dev-v2.5-source/packages/rancher-pushprox
+## ref: https://github.com/rancher/charts/tree/release-v2.6/charts/rancher-pushprox
+##
+
+# hardenedKubelet can only be deployed if kubelet.enabled=true
@ -430,20 +439,21 @@
## Provide a k8s version to auto dashboard import script example: kubeTargetVersionOverride: 1.16.6
##
@@ -93,8 +507,32 @@
@@ -93,8 +516,33 @@
##
global:
+ cattle:
+ systemDefaultRegistry: ""
+ ## Windows Monitoring
+ ## ref: https://github.com/rancher/charts/tree/dev-v2.5-source/packages/rancher-windows-exporter
+ ## RKE1 Windows Monitoring
+ ## ref: https://github.com/rancher/charts/tree/release-v2.6/charts/rancher-windows-exporter
+ ##
+ ## Deploys a DaemonSet of Prometheus exporters based on https://github.com/prometheus-community/windows_exporter.
+ ## Every Windows host must have a wins version of 0.1.0+ to use this chart (default as of Rancher 2.5.8).
+ ## To upgrade wins versions on Windows hosts, see https://github.com/rancher/wins/tree/master/charts/rancher-wins-upgrader.
+ ##
+ windows:
+ # Do not enable this value if rke2Windows.enabled=true
+ enabled: false
+ kubectl:
+ repository: rancher/kubectl
@ -463,7 +473,7 @@
pspEnabled: true
pspAnnotations: {}
## Specify pod annotations
@@ -187,25 +625,76 @@
@@ -187,25 +635,76 @@
## ref: https://prometheus.io/docs/alerting/notifications/
## https://prometheus.io/docs/alerting/notification_examples/
##
@ -559,7 +569,7 @@
ingress:
enabled: false
@@ -395,7 +884,7 @@
@@ -395,7 +894,7 @@
## Image of Alertmanager
##
image:
@ -568,7 +578,7 @@
tag: v0.22.2
sha: ""
@@ -507,9 +996,13 @@
@@ -507,9 +1006,13 @@
## Define resources requests and limits for single Pods.
## ref: https://kubernetes.io/docs/user-guide/compute-resources/
##
@ -585,7 +595,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.
@@ -613,6 +1106,30 @@
@@ -613,6 +1116,30 @@
enabled: true
namespaceOverride: ""
@ -616,7 +626,7 @@
## ForceDeployDatasources Create datasource configmap even if grafana deployment has been disabled
##
forceDeployDatasources: false
@@ -625,6 +1142,18 @@
@@ -625,6 +1152,18 @@
##
defaultDashboardsEnabled: true
@ -635,7 +645,7 @@
adminPassword: prom-operator
ingress:
@@ -664,6 +1193,7 @@
@@ -664,6 +1203,7 @@
dashboards:
enabled: true
label: grafana_dashboard
@ -643,7 +653,7 @@
## Annotations for Grafana dashboard configmaps
##
@@ -716,7 +1246,60 @@
@@ -716,7 +1256,60 @@
## Passed to grafana subchart and used by servicemonitor below
##
service:
@ -705,7 +715,7 @@
## If true, create a serviceMonitor for grafana
##
@@ -746,6 +1329,14 @@
@@ -746,6 +1339,14 @@
# targetLabel: nodename
# replacement: $1
# action: replace
@ -720,7 +730,7 @@
## Component scraping the kube api server
##
@@ -907,7 +1498,7 @@
@@ -907,7 +1508,7 @@
## Component scraping the kube controller manager
##
kubeControllerManager:
@ -729,7 +739,7 @@
## If your kube controller manager is not deployed as a pod, specify IPs it can be found on
##
@@ -1054,7 +1645,7 @@
@@ -1054,7 +1655,7 @@
## Component scraping etcd
##
kubeEtcd:
@ -738,7 +748,7 @@
## If your etcd is not deployed as a pod, specify IPs it can be found on
##
@@ -1119,7 +1710,7 @@
@@ -1119,7 +1720,7 @@
## Component scraping kube scheduler
##
kubeScheduler:
@ -747,7 +757,7 @@
## If your kube scheduler is not deployed as a pod, specify IPs it can be found on
##
@@ -1177,7 +1768,7 @@
@@ -1177,7 +1778,7 @@
## Component scraping kube proxy
##
kubeProxy:
@ -756,7 +766,7 @@
## If your kube proxy is not deployed as a pod, specify IPs it can be found on
##
@@ -1266,6 +1857,13 @@
@@ -1266,6 +1867,13 @@
create: true
podSecurityPolicy:
enabled: true
@ -770,7 +780,7 @@
## Deploy node exporter as a daemonset to all nodes
##
@@ -1319,6 +1917,16 @@
@@ -1319,6 +1927,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)$
@ -787,7 +797,7 @@
## Manages Prometheus and Alertmanager components
##
@@ -1331,8 +1939,8 @@
@@ -1331,8 +1949,8 @@
enabled: true
# Value must match version names from https://golang.org/pkg/crypto/tls/#pkg-constants
tlsMinVersion: VersionTLS13
@ -798,7 +808,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
@@ -1349,7 +1957,7 @@
@@ -1349,7 +1967,7 @@
patch:
enabled: true
image:
@ -807,7 +817,7 @@
tag: v1.5.2
sha: ""
pullPolicy: IfNotPresent
@@ -1498,13 +2106,13 @@
@@ -1498,13 +2116,13 @@
## Resource limits & requests
##
@ -828,7 +838,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
@@ -1557,7 +2165,7 @@
@@ -1557,7 +2175,7 @@
## Prometheus-operator image
##
image:
@ -837,7 +847,7 @@
tag: v0.48.0
sha: ""
pullPolicy: IfNotPresent
@@ -1573,7 +2181,7 @@
@@ -1573,7 +2191,7 @@
## Prometheus-config-reloader image to use for config and rule reloading
##
prometheusConfigReloaderImage:
@ -846,7 +856,7 @@
tag: v0.48.0
sha: ""
@@ -1659,7 +2267,7 @@
@@ -1659,7 +2277,7 @@
port: 9090
## To be used with a proxy extraContainer port
@ -855,7 +865,7 @@
## List of IP addresses at which the Prometheus server service is available
## Ref: https://kubernetes.io/docs/user-guide/services/#external-ips
@@ -1916,7 +2524,7 @@
@@ -1916,7 +2534,7 @@
## Image of Prometheus.
##
image:
@ -864,7 +874,7 @@
tag: v2.27.1
sha: ""
@@ -1979,6 +2587,11 @@
@@ -1979,6 +2597,11 @@
##
externalUrl: ""
@ -876,7 +886,7 @@
## Define which Nodes the Pods are scheduled on.
## ref: https://kubernetes.io/docs/user-guide/node-selection/
##
@@ -2011,7 +2624,7 @@
@@ -2011,7 +2634,7 @@
## prometheus resource to be created with selectors based on values in the helm deployment,
## which will also match the PrometheusRule resources created
##
@ -885,7 +895,7 @@
## PrometheusRules to be selected for target discovery.
## If {}, select all PrometheusRules
@@ -2036,7 +2649,7 @@
@@ -2036,7 +2659,7 @@
## prometheus resource to be created with selectors based on values in the helm deployment,
## which will also match the servicemonitors created
##
@ -894,7 +904,7 @@
## ServiceMonitors to be selected for target discovery.
## If {}, select all ServiceMonitors
@@ -2059,7 +2672,7 @@
@@ -2059,7 +2682,7 @@
## prometheus resource to be created with selectors based on values in the helm deployment,
## which will also match the podmonitors created
##
@ -903,7 +913,7 @@
## PodMonitors to be selected for target discovery.
## If {}, select all PodMonitors
@@ -2190,9 +2803,13 @@
@@ -2190,9 +2813,13 @@
## Resource limits & requests
##
@ -920,7 +930,7 @@
## Prometheus StorageSpec for persistent data
## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/storage.md
@@ -2215,7 +2832,13 @@
@@ -2215,7 +2842,13 @@
# medium: Memory
# Additional volumes on the output StatefulSet definition.
@ -935,7 +945,7 @@
# Additional VolumeMounts on the output StatefulSet definition.
volumeMounts: []
@@ -2322,9 +2945,34 @@
@@ -2322,9 +2955,34 @@
##
thanos: {}
@ -971,7 +981,7 @@
## InitContainers allows injecting additional initContainers. This is meant to allow doing some changes
## (permissions, dir tree) on mounted volumes before starting prometheus
@@ -2332,7 +2980,7 @@
@@ -2332,7 +2990,7 @@
## PortName to use for Prometheus.
##

2
packages/rancher-sriov/package.yaml
View File

@ -1,7 +1,7 @@
url: https://github.com/k8snetworkplumbingwg/sriov-network-operator.git
subdirectory: deployment/sriov-network-operator
commit: c5c943cc214f4113b6f6be8d7c48ac837aa1669c
packageVersion: 1
version: 100.0.0
additionalCharts:
- workingDir: charts-crd
crdOptions:

2
packages/rancher-sriov/templates/crd-template/Chart.yaml
View File

@ -1,5 +1,5 @@
apiVersion: v2
version: 0.1.0
version: 100.0.0
description: Installs the CRDs for rke2-sriov.
name: sriov-crd
type: application