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

copy charts from dev-charts

pull/504/head
Caleb Bron 2020-07-30 16:09:43 -07:00
parent 1fa06788d7
commit f7dd80a3c1
20 changed files with 132 additions and 379 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,2 +1,3 @@
/packages/**/charts-original
/.idea
/.idea
.DS_Store

2
packages/canal/charts/Chart.yaml
View File

@ -7,7 +7,7 @@ home: https://www.projectcalico.org/
keywords:
- canal
sources:
- https://github.com/rancher/charts
- https://github.com/rancher/dev-charts
maintainers:
- name: Rancher Labs
email: charts@rancher.com

6
packages/enterprise-cluster-manager/charts/Chart.yaml
View File

@ -11,6 +11,6 @@ maintainers:
- name: Rancher Labs
email: charts@rancher.com
annotations:
catalog.rancher.io/certified: rancher
catalog.rancher.io/namespace: cattle-system
catalog.rancher.io/release-name: enterprise-cluster-manager-feature
catalog.cattle.io/certified: rancher
catalog.cattle.io/namespace: cattle-system
catalog.cattle.io/release-name: enterprise-cluster-manager-feature

2
packages/kube-proxy/charts/Chart.yaml
View File

@ -6,7 +6,7 @@ appVersion: v1.18.4
keywords:
- kube-proxy
sources:
- https://github.com/rancher/charts
- https://github.com/rancher/dev-charts
maintainers:
- name: Rancher Labs
email: charts@rancher.com

11
packages/rancher-gatekeeper/rancher-gatekeeper.patch
View File

@ -1,7 +1,7 @@
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/Chart.yaml packages/rancher-gatekeeper/charts/Chart.yaml
--- packages/rancher-gatekeeper/charts-original/Chart.yaml
+++ packages/rancher-gatekeeper/charts/Chart.yaml
@@ -1,10 +1,15 @@
@@ -1,10 +1,16 @@
apiVersion: v1
description: A Helm chart for Gatekeeper
-name: gatekeeper-operator
@ -14,11 +14,12 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/Cha
sources:
- https://github.com/open-policy-agent/gatekeeper.git
appVersion: v3.1.0-beta.7
+icon: https://dev-charts.rancher.io/logos/gatekeeper.svg
+annotations:
+ catalog.rancher.io/certified: rancher
+ catalog.rancher.io/experimental: true
+ catalog.rancher.io/namespace: gatekeeper-system
+ catalog.rancher.io/release-name: rancher-gatekeeper
+ catalog.cattle.io/certified: rancher
+ catalog.cattle.io/experimental: true
+ catalog.cattle.io/namespace: gatekeeper-system
+ catalog.cattle.io/release-name: rancher-gatekeeper
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/helm-modifications/helm-modifications.yaml packages/rancher-gatekeeper/charts/helm-modifications/helm-modifications.yaml
--- packages/rancher-gatekeeper/charts-original/helm-modifications/helm-modifications.yaml
+++ packages/rancher-gatekeeper/charts/helm-modifications/helm-modifications.yaml

12
packages/rancher-istio/charts/Chart.yaml
View File

@ -1,9 +1,11 @@
apiVersion: v1
appVersion: 1.6.5
appVersion: 1.6.6
description: Helm chart for installing istio components with the istioctl
name: rancher-istio-installer
version: 1.6.500
version: 1.6.600
icon: https://dev-charts.rancher.io/logos/istio.svg
annotations:
catalog.rancher.io/certified: rancher
catalog.rancher.io/namespace: istio-system
catalog.rancher.io/release-name: rancher-istio
catalog.cattle.io/certified: rancher
catalog.cattle.io/namespace: istio-system
catalog.cattle.io/release-name: rancher-istio
catalog.cattle.io/ui-component: istio

231
packages/rancher-istio/charts/configs/istio-base.yaml
View File

@ -2,21 +2,11 @@ apiVersion: install.istio.io/v1alpha1
kind: IstioOperator
spec:
addonComponents:
grafana:
enabled: {{ .Values.grafana.enabled }}
istiocoredns:
enabled: {{ .Values.istiocoredns.enabled }}
kiali:
enabled: {{ .Values.kiali.enabled }}
prometheus:
enabled: {{ .Values.prometheus.enabled }}
tracing:
enabled: {{ .Values.tracing.enabled }}
components:
base:
enabled: {{ .Values.base.enabled }}
citadel:
enabled: {{ .Values.citadel.enabled }}
cni:
enabled: {{ .Values.cni.enabled }}
egressGateways:
@ -25,6 +15,27 @@ spec:
ingressGateways:
- enabled: {{ .Values.ingressGateways.enabled }}
name: istio-ingressgateway
k8s:
service:
ports:
- name: status-port
port: 15021
targetPort: 15021
- name: http2
port: 80
targetPort: 8080
nodePort: 31380
- name: https
port: 443
targetPort: 8443
nodePort: 31390
- name: tcp
port: 31400
targetPort: 31400
nodePort: 31400
- name: tls
port: 15443
targetPort: 15443
istiodRemote:
enabled: {{ .Values.istiodRemote.enabled }}
pilot:
@ -34,187 +45,26 @@ spec:
telemetry:
enabled: {{ .Values.telemetry.enabled }}
hub: docker.io/istio
meshConfig:
{{- if .Values.global.accessLogFile }}
accessLogFile: "{{ .Values.global.accessLogFile }}"
{{- end }}
{{- if .Values.global.disablePolicyChecks }}
disablePolicyChecks: {{ .Values.global.disablePolicyChecks }}
{{- end }}
defaultConfig:
proxyMetadata: {}
{{- if .Values.global.enableAutoMtls }}
enableAutoMtls: {{ .Values.global.enableAutoMtls }}
{{- end }}
profile: default
tag: 1.6.5
tag: {{ .Values.tag }}
revision: {{ .Values.revision }}
values:
gateways:
istio-egressgateway:
name: istio-egressgateway
type: {{ .Values.egressGateways.type }}
istio-ingressgateway:
name: istio-ingressgateway
type: {{ .Values.ingressGateways.type }}
global:
arch:
{{- if .Values.global.arch.amd64 }}
amd64: {{ .Values.global.arch.amd64 }}
{{- end }}
{{- if .Values.global.arch.ppc64le }}
ppc64le: {{ .Values.global.arch.ppc64le }}
{{- end }}
{{- if .Values.global.arch.s390x }}
s390x: {{ .Values.global.arch.s390x }}
{{- end }}
{{- if .Values.global.configValidation }}
configValidation: {{ .Values.global.configValidation }}
{{- end }}
{{- if .Values.global.controlPlaneSecurityEnabled }}
controlPlaneSecurityEnabled: {{ .Values.global.controlPlaneSecurityEnabled }}
{{- end }}
{{- if .Values.global.defaultNodeSelector }}
defaultNodeSelector: {{ .Values.global.defaultNodeSelector | toJson | indent 4 }}
{{- end }}
{{- if .Values.global.defaultPodDisruptionBudget.enabled }}
defaultPodDisruptionBudget:
enabled: {{ .Values.global.defaultPodDisruptionBudget.enabled }}
{{- end }}
defaultResources:
requests:
{{- if .Values.global.defaultResources.requests.cpu }}
cpu: {{ .Values.global.defaultResources.requests.cpu }}
{{- end }}
{{- if .Values.global.enableHelmTest }}
enableHelmTest: {{ .Values.global.enableHelmTest}}
{{- end }}
{{- if .Values.global.imagePullPolicy }}
imagePullPolicy: {{ .Values.global.imagePullPolicy }}
{{- end }}
imagePullSecrets: []
istioNamespace: istio-system
{{- if .Values.global.istiod.enabled }}
istiod:
enableAnalysis: {{ .Values.global.istiod.enableAnalysis }}
enabled: {{ .Values.global.istiod.enabled }}
{{- end }}
logging:
{{- if .Values.global.logging.level }}
level: "{{ .Values.global.logging.level }}"
{{- end }}
{{- if .Values.global.meshExpansion.enabled }}
meshExpansion:
enabled: {{ .Values.global.meshExpansion.enabled }}
useILB: {{ .Values.global.meshExpansion.useILB }}
{{- end }}
meshNetworks: {}
{{- if .Values.global.mountMtlsCerts }}
mountMtlsCerts: {{ .Values.global.mountMtlsCerts }}
{{- end }}
{{- if .Values.global.multiCluster.enabled }}
multiCluster:
clusterName: "{{ .Values.global.multiCluster.clusterName }}"
enabled: {{ .Values.global.multiCluster.enabled }}
{{- end }}
{{- if .Values.global.network }}
network: "{{ .Values.global.network }}"
{{- end }}
{{- if .Values.global.oneNamespace}}
oneNamespace: {{ .Values.global.oneNamespace }}
{{- end }}
{{- if .Values.global.operatorManageWebhooks }}
operatorManageWebhooks: {{ .Values.global.operatorManageWebhooks }}
{{- end }}
{{- if .Values.global.pilotCertProvider }}
pilotCertProvider: {{ .Values.global.pilotCertProvider }}
{{- end }}
{{- if .Values.global.priorityClassName }}
priorityClassName: {{ .Values.global.priorityClassName }}
{{- end }}
proxy:
autoInject: {{ .Values.global.proxy.autoInject }}
clusterDomain: {{ .Values.global.proxy.clusterDomain }}
protocolDetectionTimeout: "{{ .Values.global.proxy.protocolDetectionTimeout }}"
componentLogLevel: {{ .Values.global.proxy.componentLogLevel }}
enableCoreDump: {{ .Values.global.proxy.enableCoreDump }}
enableCoreDumpImage: "{{ .Values.global.proxy.enableCoreDumpImage }}"
envoyStatsd:
enabled: {{ .Values.global.proxy.enableCoreDump }}
excludeIPRanges: "{{ .Values.global.proxy.excludeIPRanges }}"
excludeInboundPorts: "{{ .Values.global.proxy.excludeInboundPorts }}"
excludeOutboundPorts: "{{ .Values.global.proxy.excludeOutboundPorts }}"
image: {{ .Values.global.proxy.image }}
includeIPRanges: '*'
logLevel: {{ .Values.global.proxy.logLevel }}
privileged: {{ .Values.global.proxy.privileged }}
readinessFailureThreshold: {{ .Values.global.proxy.readinessFailureThreshold }}
readinessInitialDelaySeconds: {{ .Values.global.proxy.readinessInitialDelaySeconds }}
readinessPeriodSeconds: {{ .Values.global.proxy.readinessPeriodSeconds }}
resources:
limits:
cpu: {{ .Values.global.proxy.resources.limits.cpu }}
memory: {{ .Values.global.proxy.resources.limits.memory }}
requests:
cpu: {{ .Values.global.proxy.resources.requests.cpu }}
memory: {{ .Values.global.proxy.resources.requests.memory }}
statusPort: {{ .Values.global.proxy.statusPort }}
tracer: {{ .Values.global.proxy.tracer }}
proxy_init:
image: {{ .Values.global.proxy_init.image}}
resources:
limits:
cpu: {{ .Values.global.proxy_init.resources.limits.cpu }}
memory: {{ .Values.global.proxy_init.resources.limits.memory }}
requests:
cpu: {{ .Values.global.proxy_init.resources.requests.cpu }}
memory: {{ .Values.global.proxy_init.resources.requests.memory }}
sds:
udsPath: "{{ .Values.global.sds.udsPath }}"
enabled: {{ .Values.global.sds.enabled }}
token:
aud: {{ .Values.global.sds.token.aud }}
tracer:
{{- if eq $.Values.global.proxy.tracer "datadog" }}
datadog:
address: {{ .Values.global.tracer.datadog.address }}
{{- end }}
{{- if eq $.Values.global.proxy.tracer "lightstep" }}
lightstep:
accessToken: "{{ .Values.global.tracer.lightstep.accessToken }}"
address: "{{ .Values.global.tracer.lightstep.address }}"
secure: {{ .Values.global.tracer.lightstep.secure }}
cacertPath: "{{ .Values.global.tracer.lightstep.cacertPath }}"
{{- end }}
{{- if eq $.Values.global.proxy.tracer "stackdriver" }}
stackdriver:
debug: {{ .Values.global.tracer.stackdriver.debug }}
maxNumberOfAnnotations: {{ .Values.global.tracer.stackdriver.maxNumberOfAnnotations }}
maxNumberOfAttributes: {{ .Values.global.tracer.stackdriver.maxNumberOfAttributes }}
maxNumberOfMessageEvents: {{ .Values.global.tracer.stackdriver.maxNumberOfMessageEvents }}
{{- end }}
{{- if eq $.Values.global.proxy.tracer "zipkin" }}
zipkin:
address: "{{ .Values.global.tracer.zipkin.address }}"
{{- end }}
trustDomain: {{ .Values.global.trustDomain }}
useMCP: {{ .Values.global.useMCP }}
{{- if .Values.grafana.enabled }}
grafana:
image:
repository: {{ .Values.grafana.repository }}
tag: {{ .Values.grafana.tag }}
{{- end }}
{{- if .Values.istiocoredns.enabled }}
istiocoredns:
coreDNSImage: {{ .Values.istiocoredns.image.repository }}
coreDNSPluginImage: {{ .Values.istiocoredns.pluginImage }}
coreDNSTag: {{ .Values.istiocoredns.image.tag }}
{{- end }}
{{- if .Values.kiali.enabled }}
kiali:
contextPath: {{ .Values.kiali.contextPath }}
dashboard:
auth:
strategy: {{ .Values.kiali.dashboard.auth.strategy }}
grafanaInClusterURL: {{ .Values.kiali.dashboard.grafanaInClusterURL }}
jaegerInClusterURL: {{ .Values.kiali.dashboard.jaegerInClusterURL }}
hub: {{ .Values.kiali.hub }}
tag: {{ .Values.kiali.tag }}
prometheusAddr: {{ .Values.kiali.prometheusAddr }}
{{- end }}
mixer:
{{- if .Values.policy.enabled }}
policy:
@ -228,24 +78,3 @@ spec:
pilot:
image: {{ .Values.pilot.image }}
{{- end }}
{{- if .Values.prometheus.enabled }}
prometheus:
hub: {{ .Values.prometheus.hub }}
tag: {{ .Values.prometheus.tag }}
{{- end }}
sidecarInjectorWebhook:
enableNamespacesByDefault:
{{ .Values.sidecarInjectorWebhook.enableNamespacesByDefault }}
injectLabel: istio-injection
objectSelector:
autoInject:
{{ .Values.sidecarInjectorWebhook.objectSelector.autoInject }}
enabled: {{ .Values.sidecarInjectorWebhook.objectSelector.enabled }}
tracing:
jaeger:
hub: {{ .Values.tracing.jaeger.hub }}
tag: "{{ .Values.tracing.jaeger.tag }}"
zipkin:
hub: {{ .Values.tracing.zipkin.hub }}
tag: {{ .Values.tracing.zipkin.tag }}
version: ""

2
packages/rancher-istio/charts/templates/admin-role.yaml
View File

@ -1,6 +1,6 @@
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
kind: ClusterRole
metadata:
labels:
rbac.authorization.k8s.io/aggregate-to-admin: "true"

2
packages/rancher-istio/charts/templates/clusterrolebinding.yaml
View File

@ -4,7 +4,7 @@ metadata:
name: istio-installer
subjects:
- kind: ServiceAccount
name: serviceaccount
name: istio-installer
namespace: istio-system
roleRef:
kind: ClusterRole

2
packages/rancher-istio/charts/templates/edit-role.yaml
View File

@ -1,6 +1,6 @@
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
kind: ClusterRole
metadata:
labels:
rbac.authorization.k8s.io/aggregate-to-edit: "true"

18
packages/rancher-istio/charts/templates/istio-install-job.yaml
View File

@ -15,16 +15,14 @@ spec:
spec:
containers:
- name: istioctl-installer
image: rancher/istio-installer:0.1.1
image: rancher/istio-installer:{{ .Values.installerVersion }}
env:
- name: RELEASE_NAME
value: {{ .Release.Name }}
- name: REVISION_NAME
value: {{ .Chart.Version }}
{{- if .Values.overlayFile }}
- name: APPLY_OVERLAY_CONFIG
value: true
{{ end }}
{{- if .Values.revision }}
- name: CANARY_REVISION
value: {{ .Values.revision }}
{{- end }}
command: ["/bin/sh","-c"]
args: ["/usr/local/app/scripts/run.sh"]
volumeMounts:
@ -35,7 +33,7 @@ spec:
- name: overlay-volume
mountPath: /app/overlay-config.yaml
subPath: overlay-config.yaml
{{ end }}
{{- end }}
volumes:
- name: config-volume
configMap:
@ -44,6 +42,6 @@ spec:
- name: overlay-volume
configMap:
name: istio-installer-overlay
{{ end }}
serviceAccountName: serviceaccount
{{- end }}
serviceAccountName: istio-installer
restartPolicy: Never

40
packages/rancher-istio/charts/templates/istio-uninstall-job.yaml Normal file
View File

@ -0,0 +1,40 @@
apiVersion: batch/v1
kind: Job
metadata:
name: istioctl-uninstaller
namespace: istio-system
annotations:
"helm.sh/hook": pre-delete
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": hook-succeeded
spec:
template:
spec:
containers:
- name: istioctl-uninstaller
image: rancher/istio-installer:{{ .Values.installerVersion }}
env:
- name: RELEASE_NAME
value: {{ .Release.Name }}
command: ["/bin/sh","-c"]
args: ["/usr/local/app/scripts/uninstall_istio_system.sh"]
volumeMounts:
- name: config-volume
mountPath: /app/istio-base.yaml
subPath: istio-base.yaml
{{- if .Values.overlayFile }}
- name: overlay-volume
mountPath: /app/overlay-config.yaml
subPath: overlay-config.yaml
{{ end }}
volumes:
- name: config-volume
configMap:
name: istio-installer-base
{{- if .Values.overlayFile }}
- name: overlay-volume
configMap:
name: istio-installer-overlay
{{ end }}
serviceAccountName: istio-installer
restartPolicy: OnFailure

2
packages/rancher-istio/charts/templates/overlay-config-map.yaml
View File

@ -5,5 +5,5 @@ metadata:
name: istio-installer-overlay
namespace: istio-system
data:
{{ toYaml .Values.overlayFile | indent 2 }}
overlay-config.yaml: {{ toYaml .Values.overlayFile | indent 2 }}
{{- end }}

2
packages/rancher-istio/charts/templates/serviceaccount.yaml
View File

@ -1,5 +1,5 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: serviceaccount
name: istio-installer
namespace: istio-system

3
packages/rancher-istio/charts/templates/view-role.yaml
View File

@ -1,6 +1,6 @@
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
kind: ClusterRole
metadata:
labels:
rbac.authorization.k8s.io/aggregate-to-view: "true"
@ -39,4 +39,3 @@ rules:
- peerauthentications
- requestauthentications
verbs: ["get", "watch", "list"]

134
packages/rancher-istio/charts/values.yaml
View File

@ -1,7 +1,7 @@
grafana:
enabled: false
repository: grafana/grafana
tag: 6.7.4
revision: "" # leave blank for no canary deployment, or set to given revision, eg: "1-7-2"
overlayFile: ""
tag: 1.6.6
installerVersion: 0.1.4
istiocoredns:
enabled: false
@ -10,46 +10,19 @@ istiocoredns:
tag: 1.6.2
pluginImage: istio/coredns-plugin:0.2-istio-1.1
kiali:
hub: quay.io/kiali
tag: v1.18
contextPath: /
dashboard:
jaegerInClusterURL: http://tracing.istio-system:80
# grafanaInClusterURL: http://access-grafana.cattle-prometheus:80
auth:
strategy: anonymous
enabled: true
# prometheusAddr: http://access-prometheus.cattle-prometheus:80
prometheus:
enabled: true
hub: docker.io/prom
tag: v2.15.1
tracing:
enabled: false
jaeger:
hub: docker.io/jaegertracing
tag: "1.16"
zipkin:
hub: docker.io/openzipkin
tag: 2.20.0
base:
enabled: true
citadel:
enabled: true
cni:
enabled: false
egressGateways:
enabled: true
type: NodePort
ingressGateways:
enabled: true
type: NodePort
istiodRemote:
enabled: false
@ -71,103 +44,10 @@ sidecarInjectorWebhook:
objectSelector:
enabled: true
autoInject: true
rewriteAppHTTPProbe: true
global:
overlayFile: ""
accessLogFile: ""
disablePolicyChecks: true
defaultConfig:
proxyMetadata: {}
enableAutoMtls: true
arch:
amd64: 2
ppc64le: 2
s390x: 2
configValidation: true
controlPlaneSecurityEnabled: false
defaultNodeSelector: {}
defaultPodDisruptionBudget:
enabled: true
defaultResources:
requests:
cpu: 10m
enableHelmTest: false
imagePullPolicy: IfNotPresent
imagePullSecrets: []
istiod:
enableAnalysis: false
enabled: true
logging:
level: "default:info"
meshExpansion:
enabled: false
useILB: false
meshNetworks: {}
mountMtlsCerts: true
multiCluster:
enabled: false
clusterName: ""
network: ""
oneNamespace: false
operatorManageWebhooks: false
pilotCertProvider: istiod
priorityClassName: ""
proxy:
autoInject: enabled
clusterDomain: cluster.local
componentLogLevel: misc:error
enableCoreDump: false
envoyStatsd:
enabled: false
excludeIPRanges: ""
excludeInboundPorts: ""
excludeOutboundPorts: ""
image: proxyv2
includeIPRanges: '*'
logLevel: warning
privileged: false
readinessFailureThreshold: 30
readinessInitialDelaySeconds: 1
readinessPeriodSeconds: 2
resources:
limits:
cpu: 2000m
memory: 1024Mi
requests:
cpu: 10m
memory: 40Mi
statusPort: 15020
tracer: zipkin
proxy_init:
image: proxyv2
resources:
limits:
cpu: 100m
memory: 50Mi
requests:
cpu: 10m
memory: 10Mi
sds:
enabled: false
udsPath: ""
token:
aud: istio-ca
sts:
servicePort: 0
tracer:
datadog:
address: $(HOST_IP):8126
lightstep:
accessToken: ""
address: ""
secure: true
cacertPath: ""
stackdriver:
debug: false
maxNumberOfAnnotations: 200
maxNumberOfAttributes: 200
maxNumberOfMessageEvents: 200
zipkin:
address: ""
trustDomain: cluster.local
useMCP: false

11
packages/rancher-logging/rancher-logging.patch
View File

@ -1,7 +1,7 @@
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/Chart.yaml packages/rancher-logging/charts/Chart.yaml
--- packages/rancher-logging/charts-original/Chart.yaml
+++ packages/rancher-logging/charts/Chart.yaml
@@ -1,5 +1,10 @@
@@ -1,5 +1,11 @@
apiVersion: v1
appVersion: 3.4.0
-description: A Helm chart to install Banzai Cloud logging-operator
@ -9,11 +9,12 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/Chart.
+description: A Helm chart to install Banzai Cloud logging-operator and a cluster logging pipeline.
+name: rancher-logging
version: 3.4.0
+
+icon: https://dev-charts.rancher.io/logos/logging.svg
+annotations:
+ catalog.rancher.io/certified: rancher
+ catalog.rancher.io/namespace: logging-system
+ catalog.rancher.io/release-name: rancher-logging
+ catalog.cattle.io/certified: rancher
+ catalog.cattle.io/namespace: logging-system
+ catalog.cattle.io/release-name: rancher-logging
+ catalog.cattle.io/component: logging
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/values.yaml packages/rancher-logging/charts/values.yaml
--- packages/rancher-logging/charts-original/values.yaml
+++ packages/rancher-logging/charts/values.yaml

17
packages/rancher-monitoring/rancher-monitoring.patch
View File

@ -1,20 +1,21 @@
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/Chart.yaml packages/rancher-monitoring/charts/Chart.yaml
--- packages/rancher-monitoring/charts-original/Chart.yaml
+++ packages/rancher-monitoring/charts/Chart.yaml
@@ -1,7 +1,10 @@
@@ -1,7 +1,11 @@
apiVersion: v1
appVersion: 0.38.1
-description: Provides easy monitoring definitions for Kubernetes services, and deployment
- and management of Prometheus instances.
+annotations:
+ catalog.rancher.io/certified: rancher
+ catalog.rancher.io/namespace: monitoring-system
+ catalog.rancher.io/release-name: rancher-monitoring
+ catalog.cattle.io/certified: rancher
+ catalog.cattle.io/namespace: monitoring-system
+ catalog.cattle.io/release-name: rancher-monitoring
+ catalog.cattle.io/ui-component: monitoring
+description: A Rancher chart that modifies the upstream Prometheus Operator chart, which provides easy monitoring definitions for Kubernetes services and the deployment and management of Prometheus instances, and enables Prometheus Adapter on a default Prometheus instance.
engine: gotpl
home: https://github.com/coreos/prometheus-operator
icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
@@ -13,7 +16,7 @@
@@ -13,7 +17,7 @@
- name: bismarck
- email: gianrubio@gmail.com
name: gianrubio
@ -1059,7 +1060,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
+ port: 9090
+
+## RKE PushProx Monitoring
+## ref: https://github.com/rancher/charts/tree/master/packages/rancher-pushprox
+## ref: https://github.com/rancher/dev-charts/tree/master/packages/rancher-pushprox
+##
+rkeControllerManager:
+ enabled: false
@ -1115,7 +1116,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
+ operator: "Exists"
+
+## k3s PushProx Monitoring
+## ref: https://github.com/rancher/charts/tree/master/packages/rancher-pushprox
+## ref: https://github.com/rancher/dev-charts/tree/master/packages/rancher-pushprox
+##
+k3sControllerManager:
+ enabled: false
@ -1144,7 +1145,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
+ useLocalhost: true
+
+## KubeADM PushProx Monitoring
+## ref: https://github.com/rancher/charts/tree/master/packages/rancher-pushprox
+## ref: https://github.com/rancher/dev-charts/tree/master/packages/rancher-pushprox
+##
+kubeAdmControllerManager:
+ enabled: false

4
packages/rancher-pushprox/charts/README.md
View File

@ -2,7 +2,7 @@
A Rancher chart based on Rancher [PushProx](https://github.com/rancher/PushProx) that sets up a Deployment of a PushProx proxy and a DaemonSet of PushProx clients on a Kubernetes cluster.
Installs [rancher-pushprox](https://github.com/rancher/charts/tree/master/packages/rancher-pushprox) to create PushProx clients that can access their host's network and register with a PushProx proxy. A [Prometheus Operator](https://github.com/coreos/prometheus-operator) ServiceMonitor CR is also included that is configured to scrape the metrics from each of the clients through the proxy.
Installs [rancher-pushprox](https://github.com/rancher/dev-charts/tree/master/packages/rancher-pushprox) to create PushProx clients that can access their host's network and register with a PushProx proxy. A [Prometheus Operator](https://github.com/coreos/prometheus-operator) ServiceMonitor CR is also included that is configured to scrape the metrics from each of the clients through the proxy.
Using an instance of this chart is suitable for the following scenarios:
- You need to scrape metrics from a port that should not be accessible outside of the host (e.g. scraping `etcd` metrics in a hardened cluster)
@ -51,4 +51,4 @@ The following tables list the configurable parameters of the rancher-pushprox ch
*Tip: The filepaths set in `clients.https.<cert|key|caCert>File` can include wildcard characters*.
See [rancher-monitoring](https://github.com/rancher/charts/tree/master/packages/rancher-monitoring) for examples of how this chart can be used.
See [rancher-monitoring](https://github.com/rancher/dev-charts/tree/master/packages/rancher-monitoring) for examples of how this chart can be used.

7
packages/rio/charts/Chart.yaml
View File

@ -4,7 +4,8 @@ version: 0.1.0
appVersion: 0.8.0-rc1
description: The application deployment engine for Kubernetes
home: https://rio.io
icon: https://dev-charts.rancher.io/logos/rio.svg
annotations:
catalog.rancher.io/certified: rancher
catalog.rancher.io/namespace: rio-system
catalog.rancher.io/release-name: rio
catalog.cattle.io/certified: rancher
catalog.cattle.io/namespace: rio-system
catalog.cattle.io/release-name: rio