diff --git a/pkg/config/templates/patch/rancher-logging/100.1.3+up3.17.7/daemonset.yaml b/pkg/config/templates/patch/rancher-logging/100.1.3+up3.17.7/daemonset.yaml deleted file mode 100644 index cc5cd7228..000000000 --- a/pkg/config/templates/patch/rancher-logging/100.1.3+up3.17.7/daemonset.yaml +++ /dev/null @@ -1,124 +0,0 @@ -{{- if .Values.additionalLoggingSources.rke2.enabled }} -# patch to 100.1.3+up3.17.7/templates/loggings/rke2/configmap.yaml -# when harvester-installer makes ISO, the original file is replaced -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: - annotations: - checksum/config: {{ include (print $.Template.BasePath "/loggings/rke2/configmap.yaml") . | sha256sum }} - name: "{{ .Release.Name }}-rke2-journald-aggregator" - namespace: "{{ .Release.Namespace }}" - labels: - name: {{ .Release.Name }}-rke2-journald-aggregator - spec: - containers: - - name: fluentbit - image: "{{ template "logging-operator.fluentbitImage" . }}" - {{- if .Values.global.seLinux.enabled }} - securityContext: - seLinuxOptions: - type: rke_logreader_t - {{- end }} - volumeMounts: - - mountPath: /fluent-bit/etc/ - name: config - - mountPath: {{ .Values.systemdLogPath | default "/var/log/journal" }} - name: journal - readOnly: true - - mountPath: "/var/lib/rancher/rke2/agent/logs/kubelet.log" - name: kubelet - readOnly: true - - mountPath: /etc/machine-id - name: machine-id - readOnly: true - - mountPath: "/var/log/audit/audit.log" # harvester-patch - name: rke2-audit - readOnly: true - {{- with .Values.tolerations }} - tolerations: {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.nodeSelector }} - nodeSelector: {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: "{{ .Release.Name }}-rke2-journald-aggregator" - volumes: - - name: config - configMap: - name: "{{ .Release.Name }}-rke2" - - name: journal - hostPath: - path: {{ .Values.systemdLogPath | default "/var/log/journal" }} - - name: kubelet - hostPath: - path: "/var/lib/rancher/rke2/agent/logs/kubelet.log" - - name: machine-id - hostPath: - path: /etc/machine-id - - name: rke2-audit # harvester-patch - hostPath: - path: "/var/log/audit/audit.log" ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: "{{ .Release.Name }}-rke2-journald-aggregator" - namespace: "{{ .Release.Namespace }}" -{{- if .Values.global.psp.enabled }} ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: "{{ .Release.Name }}-rke2-journald-aggregator" -rules: - - apiGroups: - - policy - resourceNames: - - "{{ .Release.Name }}-rke2-journald-aggregator" - resources: - - podsecuritypolicies - verbs: - - use ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: "{{ .Release.Name }}-rke2-journald-aggregator" -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: "{{ .Release.Name }}-rke2-journald-aggregator" -subjects: - - kind: ServiceAccount - name: "{{ .Release.Name }}-rke2-journald-aggregator" ---- -apiVersion: policy/v1beta1 -kind: PodSecurityPolicy -metadata: - name: "{{ .Release.Name }}-rke2-journald-aggregator" - namespace: "{{ .Release.Namespace }}" -spec: - allowPrivilegeEscalation: false - fsGroup: - rule: RunAsAny - readOnlyRootFilesystem: true - runAsUser: - rule: RunAsAny - seLinux: - rule: RunAsAny - supplementalGroups: - rule: RunAsAny - volumes: - - configMap - - emptyDir - - secret - - hostPath -{{- end }} -{{- end }} diff --git a/pkg/config/templates/patch/rancher-logging/100.1.3+up3.17.7/eventtailer.yaml b/pkg/config/templates/patch/rancher-logging/100.1.3+up3.17.7/eventtailer.yaml deleted file mode 100644 index 0dd8e6686..000000000 --- a/pkg/config/templates/patch/rancher-logging/100.1.3+up3.17.7/eventtailer.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- with $.Values.eventTailer }} -# patch to 100.1.3+up3.17.7/templates/eventtailer.yaml -# harvester-patch to import the event tailer feature -apiVersion: logging-extensions.banzaicloud.io/v1alpha1 -kind: EventTailer -metadata: - name: {{ .name | default "harvester-default-event-tailer" }} - namespace: {{ .namespace | default "cattle-logging-system" }} -spec: - controlNamespace: {{ .controlNamespace | default "cattle-logging-system" }} -{{- with .workloadOverrides }} - workloadOverrides: -{{ toYaml . | indent 4 }} -{{- end }} -{{- end }} diff --git a/pkg/config/templates/patch/rancher-logging/102.0.0+up3.17.10/configmap.yaml b/pkg/config/templates/patch/rancher-logging/102.0.0+up3.17.10/configmap.yaml deleted file mode 100644 index b7253e7ce..000000000 --- a/pkg/config/templates/patch/rancher-logging/102.0.0+up3.17.10/configmap.yaml +++ /dev/null @@ -1,82 +0,0 @@ -{{- if .Values.additionalLoggingSources.rke2.enabled }} -# patch to 100.1.3+up3.17.7/templates/loggings/rke2/configmap.yaml -# when harvester-installer makes ISO, the original file is replaced -# harvester-patch to configmap fluent-bit.conf -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ .Release.Name }}-rke2 - labels: -{{ include "logging-operator.labels" . | indent 4 }} -data: - fluent-bit.conf: | - [SERVICE] - Flush 1 - Grace 5 - Daemon Off - Log_Level info - Coro_Stack_Size 24576 - Parsers_File parsers.conf - - [INPUT] - Name systemd - Tag rke2 - Path {{ .Values.systemdLogPath }} - Systemd_Filter _SYSTEMD_UNIT=rke2-server.service - Systemd_Filter _SYSTEMD_UNIT=rke2-agent.service - Systemd_Filter _SYSTEMD_UNIT=rancherd.service - Systemd_Filter _SYSTEMD_UNIT=rancher-system-agent.service - Systemd_Filter _SYSTEMD_UNIT=wicked.service - Systemd_Filter _SYSTEMD_UNIT=iscsid.service - Systemd_Filter _TRANSPORT=kernel - {{- if .Values.additionalLoggingSources.rke2.stripUnderscores }} - Strip_Underscores On - {{- end }} - - [INPUT] - Name tail - Tag rke2 - Path /var/lib/rancher/rke2/agent/logs/kubelet.log - - [INPUT] - Name tail - Tag rke2 - Path /var/log/audit/audit.log - - [FILTER] - Name parser - Match * - Key_Name log - Parser klog - Reserve_Data On - - [FILTER] - Name parser - Match * - Key_Name MESSAGE - Parser klog - Reserve_Data On - - [FILTER] - Name parser - Match * - Key_Name MESSAGE - Parser rancher - Reserve_Data On - - [FILTER] - Name parser - Match * - Key_Name MESSAGE - Parser etcd - Reserve_Data On - - [OUTPUT] - Name forward - Match * - Host {{ .Release.Name }}-root-fluentd.{{ .Release.Namespace }}.svc - Port 24240 - Retry_Limit False - parsers.conf: | -{{ include "logging-operator.parsers" . | indent 4 }} -{{- end }} diff --git a/pkg/config/templates/patch/rancher-logging/100.1.3+up3.17.7/configmap.yaml b/pkg/config/templates/patch/rancher-logging/102.0.1+up3.17.10/configmap.yaml similarity index 97% rename from pkg/config/templates/patch/rancher-logging/100.1.3+up3.17.7/configmap.yaml rename to pkg/config/templates/patch/rancher-logging/102.0.1+up3.17.10/configmap.yaml index b7253e7ce..a35d2d095 100644 --- a/pkg/config/templates/patch/rancher-logging/100.1.3+up3.17.7/configmap.yaml +++ b/pkg/config/templates/patch/rancher-logging/102.0.1+up3.17.10/configmap.yaml @@ -1,5 +1,5 @@ {{- if .Values.additionalLoggingSources.rke2.enabled }} -# patch to 100.1.3+up3.17.7/templates/loggings/rke2/configmap.yaml +# patch to 102.0.1+up3.17.10/templates/loggings/rke2/configmap.yaml # when harvester-installer makes ISO, the original file is replaced # harvester-patch to configmap fluent-bit.conf apiVersion: v1 diff --git a/pkg/config/templates/patch/rancher-logging/102.0.0+up3.17.10/daemonset.yaml b/pkg/config/templates/patch/rancher-logging/102.0.1+up3.17.10/daemonset.yaml similarity index 98% rename from pkg/config/templates/patch/rancher-logging/102.0.0+up3.17.10/daemonset.yaml rename to pkg/config/templates/patch/rancher-logging/102.0.1+up3.17.10/daemonset.yaml index c87a6188e..210498b69 100644 --- a/pkg/config/templates/patch/rancher-logging/102.0.0+up3.17.10/daemonset.yaml +++ b/pkg/config/templates/patch/rancher-logging/102.0.1+up3.17.10/daemonset.yaml @@ -1,5 +1,5 @@ {{- if .Values.additionalLoggingSources.rke2.enabled }} -# patch to 100.1.3+up3.17.7/templates/loggings/rke2/configmap.yaml +# patch to 102.0.1+up3.17.10/templates/loggings/rke2/configmap.yaml # when harvester-installer makes ISO, the original file is replaced apiVersion: apps/v1 kind: DaemonSet diff --git a/pkg/config/templates/patch/rancher-logging/102.0.0+up3.17.10/eventtailer.yaml b/pkg/config/templates/patch/rancher-logging/102.0.1+up3.17.10/eventtailer.yaml similarity index 89% rename from pkg/config/templates/patch/rancher-logging/102.0.0+up3.17.10/eventtailer.yaml rename to pkg/config/templates/patch/rancher-logging/102.0.1+up3.17.10/eventtailer.yaml index 0dd8e6686..3257ab30a 100644 --- a/pkg/config/templates/patch/rancher-logging/102.0.0+up3.17.10/eventtailer.yaml +++ b/pkg/config/templates/patch/rancher-logging/102.0.1+up3.17.10/eventtailer.yaml @@ -1,5 +1,5 @@ {{- with $.Values.eventTailer }} -# patch to 100.1.3+up3.17.7/templates/eventtailer.yaml +# patch to 102.0.1+up3.17.10/templates/eventtailer.yaml # harvester-patch to import the event tailer feature apiVersion: logging-extensions.banzaicloud.io/v1alpha1 kind: EventTailer diff --git a/pkg/config/templates/patch/rancher-monitoring-crd/102.0.0+up40.1.2/rbac.yaml b/pkg/config/templates/patch/rancher-monitoring-crd/102.0.2+up40.1.2/rbac.yaml similarity index 100% rename from pkg/config/templates/patch/rancher-monitoring-crd/102.0.0+up40.1.2/rbac.yaml rename to pkg/config/templates/patch/rancher-monitoring-crd/102.0.2+up40.1.2/rbac.yaml diff --git a/pkg/config/templates/patch/rancher-monitoring/102.0.0+up40.1.2/nginx-config.yaml b/pkg/config/templates/patch/rancher-monitoring/102.0.2+up40.1.2/nginx-config.yaml similarity index 96% rename from pkg/config/templates/patch/rancher-monitoring/102.0.0+up40.1.2/nginx-config.yaml rename to pkg/config/templates/patch/rancher-monitoring/102.0.2+up40.1.2/nginx-config.yaml index 68b7f4678..48d33bc16 100644 --- a/pkg/config/templates/patch/rancher-monitoring/102.0.0+up40.1.2/nginx-config.yaml +++ b/pkg/config/templates/patch/rancher-monitoring/102.0.2+up40.1.2/nginx-config.yaml @@ -95,7 +95,7 @@ data: ~.*/dashboard/harvester/c/(c-m-.+)/kubevirt.io.virtualmachine/.*/.* '"appSubUrl":"/k8s/clusters/$1/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"'; ~.*/dashboard/harvester/c/(c-m-.+)/.* '"appSubUrl":"/k8s/clusters/$1/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"'; ~.*/api/v1/namespaces/cattle-monitoring-system/.* '"appSubUrl":"/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"'; - default '"appSubUrl":"/k8s/clusters/local/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"'; + default '"appSubUrl":"/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"'; } } diff --git a/pkg/config/templates/rancherd-22-addons.yaml b/pkg/config/templates/rancherd-22-addons.yaml index bd4d6034b..da37fb903 100644 --- a/pkg/config/templates/rancherd-22-addons.yaml +++ b/pkg/config/templates/rancherd-22-addons.yaml @@ -42,7 +42,7 @@ resources: namespace: cattle-logging-system spec: repo: http://harvester-cluster-repo.cattle-system.svc/charts - version: "102.0.0+up3.17.10" + version: "102.0.1+up3.17.10" chart: rancher-logging {{- if and .Addons .Addons.rancher_logging }} enabled: {{ .Addons.rancher_logging.Enabled }} @@ -96,7 +96,7 @@ resources: controlNamespace: cattle-logging-system workloadOverrides: containers: - - image: rancher/harvester-eventrouter:v0.1.1 + - image: rancher/harvester-eventrouter:v0.1.2 name: event-tailer resources: limits: @@ -112,7 +112,7 @@ resources: namespace: cattle-monitoring-system spec: repo: http://harvester-cluster-repo.cattle-system.svc/charts - version: "102.0.0+up40.1.2" + version: "102.0.2+up40.1.2" chart: rancher-monitoring {{- if and .Addons .Addons.rancher_monitoring }} enabled: {{ .Addons.rancher_monitoring.Enabled }} diff --git a/scripts/images/harvester-additional-images.txt b/scripts/images/harvester-additional-images.txt index ecb677709..2b6e3dbc3 100644 --- a/scripts/images/harvester-additional-images.txt +++ b/scripts/images/harvester-additional-images.txt @@ -1,2 +1,2 @@ registry.suse.com/suse/vmdp/vmdp:2.5.4.2 -rancher/harvester-eventrouter:v0.1.1 +rancher/harvester-eventrouter:v0.1.2 diff --git a/scripts/images/rancher-images.txt b/scripts/images/rancher-images.txt index 8937a62d8..c0045df12 100644 --- a/scripts/images/rancher-images.txt +++ b/scripts/images/rancher-images.txt @@ -9,7 +9,7 @@ docker.io/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.3.0 docker.io/rancher/mirrored-kiwigrid-k8s-sidecar:1.19.2 docker.io/rancher/mirrored-kube-state-metrics-kube-state-metrics:v2.6.0 docker.io/rancher/mirrored-library-busybox:1.31.1 -docker.io/rancher/mirrored-library-nginx:1.21.1-alpine +docker.io/rancher/mirrored-library-nginx:1.24.0-alpine docker.io/rancher/mirrored-prometheus-adapter-prometheus-adapter:v0.10.0 docker.io/rancher/mirrored-prometheus-node-exporter:v1.3.1 docker.io/rancher/mirrored-prometheus-operator-prometheus-config-reloader:v0.59.1 @@ -20,6 +20,7 @@ docker.io/rancher/rancher-webhook:v0.3.6 docker.io/rancher/rancher:v2.7.9 docker.io/rancher/shell:v0.1.21 docker.io/rancher/shell:v0.1.18 +docker.io/rancher/shell:v0.1.19 docker.io/rancher/system-agent:v0.3.3-suc docker.io/rancher/system-upgrade-controller:v0.11.0 docker.io/rancher/mirrored-banzaicloud-fluentd:v1.14.6-alpine-5 diff --git a/scripts/version-logging b/scripts/version-logging index 8810e2864..4953ba2de 100644 --- a/scripts/version-logging +++ b/scripts/version-logging @@ -1 +1 @@ -LOGGING_VERSION=102.0.0+up3.17.10 +LOGGING_VERSION=102.0.1+up3.17.10 diff --git a/scripts/version-monitoring b/scripts/version-monitoring index eee778a58..305311b3c 100644 --- a/scripts/version-monitoring +++ b/scripts/version-monitoring @@ -1 +1 @@ -MONITORING_VERSION=102.0.0+up40.1.2 +MONITORING_VERSION=102.0.2+up40.1.2