(dev-v2.6-archive) Merge pull request #534 from aiyengar2/alerting_v2

Add Alerting V2

(partially cherry picked from commit 58374d5078)

packages/fleet-agent/package.yaml

@@ -0,0 +1,2 @@
+url: https://github.com/rancher/fleet/releases/download/v0.3.0-alpha2/fleet-agent-0.3.0-alpha2.tgz
+packageVersion: 00

packages/fleet-crd/package.yaml

@@ -0,0 +1,2 @@
+url: https://github.com/rancher/fleet/releases/download/v0.3.0-alpha2/fleet-crd-0.3.0-alpha2.tgz
+packageVersion: 00

packages/fleet/package.yaml

@@ -0,0 +1,2 @@
+url: https://github.com/rancher/fleet/releases/download/v0.3.0-alpha2/fleet-0.3.0-alpha2.tgz
+packageVersion: 00

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

@@ -52,7 +52,7 @@ spec:
       enabled: {{ .Values.policy.enabled }}
     telemetry:
       enabled: {{ .Values.telemetry.enabled }}
-  hub: docker.io/istio
+  hub: {{ .Values.systemDefaultRegistry | default "docker.io" }}
   profile: default
   tag: {{ .Values.tag }}
   revision: {{ .Values.revision }}
@@ -69,23 +69,27 @@ spec:
     global:
       istioNamespace: {{ template "istio.namespace" . }}
       proxy:
-        image: {{ .Values.global.proxy.image }}
+        image: {{ template "system_default_registry" . }}{{ .Values.global.proxy.repository }}:{{ .Values.global.proxy.tag }}
       proxy_init:
-        image: {{ .Values.global.proxy_init.image}}
+        image: {{ template "system_default_registry" . }}{{ .Values.global.proxy_init.repository}}:{{ .Values.global.proxy_init.tag }}
     istiocoredns:
-      coreDNSImage: {{ .Values.istiocoredns.image.repository }}
+      coreDNSImage: {{ template "system_default_registry" . }}{{ .Values.istiocoredns.image.repository }}
-      coreDNSPluginImage: {{ .Values.istiocoredns.pluginImage }}
+      coreDNSPluginImage: {{ template "system_default_registry" . }}{{ .Values.istiocoredns.pluginImage.repository }}:{{ .Values.istiocoredns.pluginImage.tag }}
       coreDNSTag: {{ .Values.istiocoredns.image.tag }}
     mixer:
       {{- if .Values.policy.enabled }}
       policy:
-        image: {{ .Values.policy.image }}
+        image: {{ template "system_default_registry" . }}{{ .Values.policy.repository}}:{{ .Values.policy.tag }}
       {{- end }}
       {{- if .Values.telemetry.enabled }}
       telemetry:
-        image: {{ .Values.telemetry.image }}
+        image: {{ template "system_default_registry" . }}{{ .Values.telemetry.repository}}:{{ .Values.telemetry.tag }}
       {{- end }}
     {{- if .Values.pilot.enabled }}
     pilot:
-      image: {{ .Values.pilot.image }}
+      image: {{ template "system_default_registry" . }}{{ .Values.pilot.repository}}:{{ .Values.pilot.tag }}
+    {{- end }}
+    {{- if .Values.cni.enabled }}
+    cni:
+      image: {{ template "system_default_registry" . }}{{ .Values.cni.repository }}:{{ .Values.cni.tag }}
     {{- end }}

packages/rancher-istio/charts/templates/_helpers.tpl

@@ -2,3 +2,11 @@
 {{- define "istio.namespace" -}}
   {{- .Release.Namespace | default "istio-system" -}}
 {{- end -}}
+
+{{- define "system_default_registry" -}}
+{{- if .Values.global.systemDefaultRegistry -}}
+{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
+{{- else -}}
+{{- "" -}}
+{{- end -}}
+{{- end -}}

packages/rancher-istio/charts/templates/istio-install-job.yaml

@@ -17,10 +17,6 @@ spec:
           env:
           - name: RELEASE_NAME
             value: {{ .Release.Name }}
-          {{- if .Values.revision }}
-          - name: CANARY_REVISION
-            value: {{ .Values.revision }}
-          {{- end }}
           - name: ISTIO_NAMESPACE
             value: {{ template "istio.namespace" . }}
           - name: FORCE_INSTALL

packages/rancher-istio/charts/values.yaml

@@ -1,21 +1,24 @@
-revision: "" # leave blank for no canary deployment, or set to given revision, eg: "1-7-2"
 overlayFile: ""
-tag: 1.6.8
+tag: 1.6.7
-installerVersion: 0.1.6
+installerVersion: 1.6.7-rancher1
 forceInstall: false
 
 istiocoredns:
     enabled: false
     image:
-      repository: coredns/coredns
+      repository: rancher/coredns-coredns
       tag: 1.6.2
-    pluginImage: istio/coredns-plugin:0.2-istio-1.1
+    pluginImage:
+      repository: rancher/istio-coredns-plugin
+      tag: 0.2-istio-1.1
 
 base:
     enabled: true
 
 cni:
     enabled: false
+    repository: rancher/istio-install-cni
+    tag: 1.6.7
 
 egressGateways:
     enabled: false
@@ -30,15 +33,18 @@ istiodRemote:
 
 pilot:
     enabled: true
-    image: pilot
+    repository: rancher/istio-pilot
+    tag: 1.6.7
 
 policy:
     enabled: true
-    image: mixer
+    repository: rancher/istio-mixer
+    tag: 1.6.7
 
 telemetry:
     enabled: true
-    image: mixer
+    repository: rancher/istio-mixer
+    tag: 1.6.7
 
 sidecarInjectorWebhook:
   enableNamespacesByDefault: false
@@ -48,10 +54,13 @@ sidecarInjectorWebhook:
   rewriteAppHTTPProbe: true
 
 global:
+  systemDefaultRegistry: ""
   proxy:
-    image: proxyv2
+    repository: rancher/istio-proxyv2
+    tag: 1.6.7
   proxy_init:
-    image: proxyv2
+    repository: rancher/istio-proxyv2
+    tag: 1.6.7
 
 # this can be removed in 1.7 as it is default
 meshConfig:
@@ -61,18 +70,15 @@ meshConfig:
 kiali:
   enabled: true
   auth:
-    # todo: what auth strategy ?
-    # strategy: token # this is default, you can use a service-account or kubeconfig token
     strategy: anonymous
   deployment:
+    ##TODO: update kiali to allow for repository and image
     ingress_enabled: false
+    image_name: docker.io/rancher/kiali-kiali
+    image_version: v1.22.1
   external_services:
     prometheus:
-      custom_metrics_url: "http://rancher-monitoring-prometheus.monitoring-system.svc:9090"
+      custom_metrics_url: "http://rancher-monitoring-prometheus.cattle-monitoring-system.svc:9090"
-      url: "http://rancher-monitoring-prometheus.monitoring-system.svc:9090"
+      url: "http://rancher-monitoring-prometheus.cattle-monitoring-system.svc:9090"
     tracing:
       enabled: false
-  # TODO : update images
-  # deployment:
-  #   image_name: "rancher..."
-  #   image_version: v1.....

packages/rancher-logging/overlay/templates/loggings/k3s/logging-k3s-openrc.yaml

@@ -1,10 +1,11 @@
-{{- if .Values.additionalLoggingSources.k3s-openrc.enabled }}
+{{- if and .Values.additionalLoggingSources.k3s.enabled (eq .Values.additionalLoggingSources.k3s.container_engine "openrc")}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Logging
 metadata:
-  name: {{ .Release.Name }}-k3s-openrc
+  name: {{ .Release.Name }}-k3s
   namespace: {{ .Release.Namespace }}
-  labels: {{ include "logging-operator.labels" . | indent 4 }}
+  labels:
+{{ include "logging-operator.labels" . | indent 4 }}
 spec:
   controlNamespace: {{ .Release.Namespace }}
   fluentbit:

packages/rancher-logging/overlay/templates/loggings/k3s/logging-k3s-systemd.yaml

@@ -1,10 +1,11 @@
-{{- if .Values.additionalLoggingSources.k3s-systemd.enabled }}
+{{- if and .Values.additionalLoggingSources.k3s.enabled (eq .Values.additionalLoggingSources.k3s.container_engine "systemd")}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Logging
 metadata:
-  name: {{ .Release.Name }}-k3s-systemd
+  name: {{ .Release.Name }}-k3s
   namespace: {{ .Release.Namespace }}
-  labels: {{ include "logging-operator.labels" . | indent 4 }}
+  labels:
+{{ include "logging-operator.labels" . | indent 4 }}
 spec:
   controlNamespace: {{ .Release.Namespace }}
   fluentbit:

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,97 @@
+@@ -76,4 +76,98 @@
  monitoring:
    # Create a Prometheus Operator ServiceMonitor object
    serviceMonitor:
@@ -125,10 +121,11 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/values
 +additionalLoggingSources:
 +  rke1:
 +    enabled: false
-+  k3s-systemd:
++  rke2:
 +    enabled: false
-+  k3s-openrc:
++  k3s:
 +    enabled: false
++    container_engine: "systemd"
 +
 +images:
 +  config_reloader: