(dev-v2.6-archive) bumped image versions (#639)

(partially cherry picked from commit 2d2f818ad5)

packages/rancher-cis-benchmark/charts/README.md

@@ -4,6 +4,11 @@ The cis-operator enables running CIS benchmark security scans on a kubernetes cl
 
 # Installation
 
+### Requirements
+
+This chart depends on the rancher-cis-benchmark-crd chart.
+
+### Installation
 ```
 helm install rancher-cis-benchmark ./ --create-namespace -n cis-operator-system
 ```

packages/rancher-cis-benchmark/charts/crds/clusterscan.yaml

@@ -4,6 +4,9 @@ metadata:
   name: clusterscans.cis.cattle.io
 spec:
   additionalPrinterColumns:
+  - JSONPath: .status.display.state
+    name: Status
+    type: string
   - JSONPath: .status.lastRunScanProfileName
     name: ClusterScanProfile
     type: string

packages/rancher-cis-benchmark/charts/values.yaml

@@ -5,7 +5,7 @@
 image:
   cisoperator:
     repository: rancher/cis-operator
-    tag: v0.0.5
+    tag: v0.0.4
   securityScan:
     repository: rancher/security-scan
     tag: v0.2.0

packages/rancher-logging/rancher-logging.patch

@@ -83,10 +83,10 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/values
 +    tag: v0.2.2
 +  fluentbit:
 +    repository: rancher/fluent-fluent-bit
-+    tag: 1.5.0
++    tag: 1.5.4
 +  fluentd:
 +    repository: rancher/banzaicloud-fluentd
-+    tag: v1.10.4-alpine-2
++    tag: v1.11.2-alpine-2
 +  syslog_forwarder:
 +    repository: rancher/fluent-bit-out-syslog
 +    tag: 0.1.0