(dev-v2.6-archive) Change to rancher images

(partially cherry picked from commit a267e30656)

packages/rancher-istio/charts/README.md

@@ -16,5 +16,5 @@ http://{{ .Values.nameOverride }}-prometheus.{{ .Values.namespaceOverride }}.svc
 
 ### Installation
 ```
-helm install rancher-istio ./ --create-namespace -n istio-system
+helm install rancher-istio ./ --create-namespace -n cattle-istio-system
 ```

packages/rancher-istio/charts/configs/istio-base.yaml

@@ -67,15 +67,13 @@ spec:
         name: istio-ingressgateway
         type: {{ .Values.ingressGateways.type }}
     global:
+      hub: {{ .Values.global.hub | default "docker.io/istio" }}
+      tag: {{ .Values.tag }}
       istioNamespace: {{ template "istio.namespace" . }}
       proxy:
         image: {{ template "system_default_registry" . }}{{ .Values.global.proxy.repository }}:{{ .Values.global.proxy.tag }}
       proxy_init:
         image: {{ template "system_default_registry" . }}{{ .Values.global.proxy_init.repository}}:{{ .Values.global.proxy_init.tag }}
-      {{- if .Values.global.defaultPodDisruptionBudget.enabled }}
-      defaultPodDisruptionBudget:
-        enabled: {{ .Values.global.defaultPodDisruptionBudget.enabled }}
-      {{- end }}
     istiocoredns:
       coreDNSImage: {{ template "system_default_registry" . }}{{ .Values.istiocoredns.image.repository }}
       coreDNSPluginImage: {{ template "system_default_registry" . }}{{ .Values.istiocoredns.pluginImage.repository }}:{{ .Values.istiocoredns.pluginImage.tag }}

packages/rancher-istio/charts/values.yaml

@@ -1,6 +1,6 @@
 overlayFile: ""
-tag: 1.6.8
-installerVersion: 1.6.8-rancher1
+tag: 1.6.7
+installerVersion: 1.6.7-rancher1
 forceInstall: false
 
 istiocoredns:
@@ -18,7 +18,7 @@ base:
 cni:
     enabled: false
     repository: rancher/istio-install-cni
-    tag: 1.6.8
+    tag: 1.6.7
 
 egressGateways:
     enabled: false
@@ -34,17 +34,17 @@ istiodRemote:
 pilot:
     enabled: true
     repository: rancher/istio-pilot
-    tag: 1.6.8
+    tag: 1.6.7
 
 policy:
     enabled: true
     repository: rancher/istio-mixer
-    tag: 1.6.8
+    tag: 1.6.7
 
 telemetry:
     enabled: true
     repository: rancher/istio-mixer
-    tag: 1.6.8
+    tag: 1.6.7
 
 sidecarInjectorWebhook:
   enableNamespacesByDefault: false
@@ -57,12 +57,10 @@ global:
   systemDefaultRegistry: ""
   proxy:
     repository: rancher/istio-proxyv2
-    tag: 1.6.8
+    tag: 1.6.7
   proxy_init:
     repository: rancher/istio-proxyv2
-    tag: 1.6.8
-  defaultPodDisruptionBudget:
-    enabled: true
+    tag: 1.6.7
 
 # this can be removed in 1.7 as it is default
 meshConfig:

packages/rancher-logging/overlay/templates/loggings/rke2/configmap.yaml

@@ -0,0 +1,18 @@
+{{- if .Values.additionalLoggingSources.rke2.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-rke2
+  labels:
+{{ include "logging-operator.labels" . | indent 4 }}
+data:
+  fluent-bit.conf: |
+    [INPUT]
+        Name              systemd
+        Tag               rke2
+        Systemd_Filter    _SYSTEMD_UNIT=rke2.service
+
+    [OUTPUT]
+        Name              file
+        Path              /etc/rancher/logging/rke2.log
+{{- end }}

packages/rancher-logging/overlay/templates/loggings/rke2/daemonset.yaml

@@ -0,0 +1,33 @@
+{{- if .Values.additionalLoggingSources.rke2.enabled }}
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: "{{ .Release.Name }}-rke2-journald-aggregator"
+  namespace: "{{ .Release.Namespace }}"
+spec:
+  selector:
+    matchLabels:
+      name: {{ .Release.Name }}-rke2-journald-aggregator
+  template:
+    metadata:
+      name: "{{ .Release.Name }}-rke2-journald-aggregator"
+      namespace: "{{ .Release.Namespace }}"
+      labels:
+        name: {{ .Release.Name }}-rke2-journald-aggregator
+    spec:
+      containers:
+        - name: fluentd
+          image: "{{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}:{{ .Values.images.fluentbit.tag }}"
+          volumeMounts:
+            - mountPath: /etc/rancher/logging/logs/
+              name: logdir
+            - mountPath: /fluent-bit/etc/
+              name: config
+      volumes:
+        - name: logdir
+          hostPath:
+            path: /etc/rancher/logging/logs/
+        - name: config
+          configMap:
+            name: "{{ .Release.Name }}-rke2"
+{{- end }}

packages/rancher-logging/overlay/templates/loggings/rke2/logging-rke2-containers.yaml

@@ -0,0 +1,28 @@
+{{- if .Values.additionalLoggingSources.rke2.enabled }}
+apiVersion: logging.banzaicloud.io/v1beta1
+kind: Logging
+metadata:
+  name: {{ .Release.Name }}-rke2-containers
+  namespace: {{ .Release.Namespace }}
+spec:
+  controlNamespace: {{ .Release.Namespace }}
+  fluentbit:
+    image:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}
+      tag: {{ .Values.images.fluentbit.tag }}
+    inputTail:
+      Tag: "rke2"
+      Path: "/var/log/containers/*rke*.log"
+    extraVolumeMounts:
+      - source: "/var/log/containers/"
+        destination: "/var/log/containers/"
+        readOnly: true
+  fluentd:
+    image:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }}
+      tag: {{ .Values.images.fluentd.tag }}
+    configReloaderImage:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.config_reloader.repository }}
+      tag: {{ .Values.images.config_reloader.tag }}
+    disablePvc: {{ .Values.disablePvc }}
+{{- end }}

packages/rancher-logging/overlay/templates/loggings/rke2/logging-rke2-journald.yaml

@@ -0,0 +1,28 @@
+{{- if .Values.additionalLoggingSources.rke2.enabled }}
+apiVersion: logging.banzaicloud.io/v1beta1
+kind: Logging
+metadata:
+  name: {{ .Release.Name }}-rke2-journald
+  namespace: {{ .Release.Namespace }}
+spec:
+  controlNamespace: {{ .Release.Namespace }}
+  fluentbit:
+    image:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}
+      tag: {{ .Values.images.fluentbit.tag }}
+    inputTail:
+      Tag: "rke2"
+      Path: "/etc/rancher/logging/logs/*.log"
+    extraVolumeMounts:
+      - source: "/etc/rancher/logging/logs/"
+        destination: "/etc/rancher/logging/logs/"
+        readOnly: true
+  fluentd:
+    image:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }}
+      tag: {{ .Values.images.fluentd.tag }}
+    configReloaderImage:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.config_reloader.repository }}
+      tag: {{ .Values.images.config_reloader.tag }}
+    disablePvc: {{ .Values.disablePvc }}
+{{- end }}

packages/rancher-logging/package.yaml

@@ -1,2 +1,5 @@
 url: https://kubernetes-charts.banzaicloud.com/charts/logging-operator-3.4.0.tgz
 packageVersion: 00
+generateCRDChart:
+  enabled: true
+  providesGVR: logging.banzaicloud.io/v1beta1

packages/rancher-logging/rancher-logging.patch

@@ -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,15 @@
+@@ -1,5 +1,11 @@
  apiVersion: v1
  appVersion: 3.4.0
 -description: A Helm chart to install Banzai Cloud logging-operator
@@ -15,10 +15,6 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/Chart.
 +  catalog.cattle.io/namespace: cattle-logging-system
 +  catalog.cattle.io/release-name: rancher-logging
 +  catalog.cattle.io/ui-component: logging
-+
-+  catalog.cattle.io/requires-gvr: logging.banzaicloud.io/v1beta1
-+  catalog.cattle.io/auto-install-gvr: logging.banzaicloud.io/v1beta1
-+  catalog.cattle.io/provides-gvr: logging.banzaicloud.io/v1beta1
 diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/templates/_helpers.tpl packages/rancher-logging/charts/templates/_helpers.tpl
 --- packages/rancher-logging/charts-original/templates/_helpers.tpl
 +++ packages/rancher-logging/charts/templates/_helpers.tpl
@@ -46,7 +42,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/values
  
  resources: {}
    # We usually recommend not to specify default resources and to leave this as a conscious
-@@ -76,4 +76,96 @@
+@@ -76,4 +76,98 @@
  monitoring:
    # Create a Prometheus Operator ServiceMonitor object
    serviceMonitor:
@@ -125,6 +121,8 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/values
 +additionalLoggingSources:
 +  rke1:
 +    enabled: false
++  rke2:
++    enabled: false
 +  k3s:
 +    enabled: false
 +    container_engine: "systemd"