From 74ea61d262fdd2181795334118004073a3ac3094 Mon Sep 17 00:00:00 2001 From: Jacob Payne Date: Wed, 16 Sep 2020 11:36:08 -0700 Subject: [PATCH] rke1 to rke (#638) --- .../rancher-logging/rancher-logging-3.6.000.tgz | Bin 7283 -> 0 bytes .../rancher-logging-crd-3.6.000.tgz | Bin 21425 -> 0 bytes .../logging-containers-rke.yaml} | 2 +- .../logging-rke1.yaml => rke/logging-rke.yaml} | 2 +- packages/rancher-logging/rancher-logging.patch | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 assets/rancher-logging/rancher-logging-3.6.000.tgz delete mode 100644 assets/rancher-logging/rancher-logging-crd-3.6.000.tgz rename packages/rancher-logging/overlay/templates/loggings/{rke1/logging-containers-rke1.yaml => rke/logging-containers-rke.yaml} (94%) rename packages/rancher-logging/overlay/templates/loggings/{rke1/logging-rke1.yaml => rke/logging-rke.yaml} (94%) diff --git a/assets/rancher-logging/rancher-logging-3.6.000.tgz b/assets/rancher-logging/rancher-logging-3.6.000.tgz deleted file mode 100644 index e28b7947cd1e993c008081f90021d72673903402..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7283 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 N|Nqvxe%S!f0063WLh=9r diff --git a/assets/rancher-logging/rancher-logging-crd-3.6.000.tgz b/assets/rancher-logging/rancher-logging-crd-3.6.000.tgz deleted file mode 100644 index e616ed7254f52843d314b31abd9bb79d317c2310..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21425 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

N-4j?bkf3ZG6%>;tz*cSG``bUh1F$A90~4o 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 diff --git a/packages/rancher-logging/overlay/templates/loggings/rke1/logging-containers-rke1.yaml b/packages/rancher-logging/overlay/templates/loggings/rke/logging-containers-rke.yaml similarity index 94% rename from packages/rancher-logging/overlay/templates/loggings/rke1/logging-containers-rke1.yaml rename to packages/rancher-logging/overlay/templates/loggings/rke/logging-containers-rke.yaml index 3b02b87ed..7e5cd36c4 100644 --- a/packages/rancher-logging/overlay/templates/loggings/rke1/logging-containers-rke1.yaml +++ b/packages/rancher-logging/overlay/templates/loggings/rke/logging-containers-rke.yaml @@ -1,4 +1,4 @@ -{{- if .Values.additionalLoggingSources.rke1.enabled }} +{{- if .Values.additionalLoggingSources.rke.enabled }} apiVersion: logging.banzaicloud.io/v1beta1 kind: Logging metadata: diff --git a/packages/rancher-logging/overlay/templates/loggings/rke1/logging-rke1.yaml b/packages/rancher-logging/overlay/templates/loggings/rke/logging-rke.yaml similarity index 94% rename from packages/rancher-logging/overlay/templates/loggings/rke1/logging-rke1.yaml rename to packages/rancher-logging/overlay/templates/loggings/rke/logging-rke.yaml index 6f9a9b8c3..af5fa9be4 100644 --- a/packages/rancher-logging/overlay/templates/loggings/rke1/logging-rke1.yaml +++ b/packages/rancher-logging/overlay/templates/loggings/rke/logging-rke.yaml @@ -1,4 +1,4 @@ -{{- if .Values.additionalLoggingSources.rke1.enabled }} +{{- if .Values.additionalLoggingSources.rke.enabled }} apiVersion: logging.banzaicloud.io/v1beta1 kind: Logging metadata: diff --git a/packages/rancher-logging/rancher-logging.patch b/packages/rancher-logging/rancher-logging.patch index c5033910e..359e24486 100644 --- a/packages/rancher-logging/rancher-logging.patch +++ b/packages/rancher-logging/rancher-logging.patch @@ -67,7 +67,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/values +disablePvc: true + +additionalLoggingSources: -+ rke1: ++ rke: + enabled: false + rke2: + enabled: false