Merge branch 'elastic-7.10.2' into 'development'

update to new elasticsearch version

See merge request !12

Dockerfile

 ARG BASE_REGISTRY=registry1.dso.mil
-ARG BASE_IMAGE=ironbank/opensource/fluentd/fluentd
-ARG BASE_TAG=1.12.1
+ARG BASE_IMAGE=ironbank/opensource/fluentd/fluentd-elasticsearch
+ARG BASE_TAG=5.0.0
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
@@ -22,4 +22,4 @@ RUN gem install --force --local -N /tmp/*.gem
 
 RUN yum remove -y make gcc gcc-c++ && dnf clean all && rm /usr/local/bundle/gems/kubeclient-4.6.0/test/config/external-key.rsa
 
-USER fluent
+USER 1000

hardening_manifest.yaml

@@ -8,13 +8,13 @@ name: "cluster-auditor/opa-collector"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-  - "0.3.1"
+  - "0.3.2"
   - "latest"
 
 # Build args passed to Dockerfile ARGs
 args:
-  BASE_IMAGE: "opensource/fluentd/fluentd"
-  BASE_TAG: "1.12.1"
+  BASE_IMAGE: "opensource/fluentd/fluentd-elasticsearch"
+  BASE_TAG: "5.0.0"
 
 # Docker image labels
 labels:
@@ -27,7 +27,7 @@ labels:
   org.opencontainers.image.url: "https://www.openpolicyagent.org/docs/latest/"
   ## Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "Big Bang"
-  org.opencontainers.image.version: "0.3.1"
+  org.opencontainers.image.version: "0.3.2"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "bigbang,opa"
   ## This value can be "opensource" or "commercial"
@@ -97,11 +97,6 @@ resources:
     validation:
       type: sha256
       value: 6c5029e9d7d8b2b295bce33089b4530992d534890b5c737ccfbc16575ff4cc71
-  - url: https://rubygems.org/downloads/multi_json-1.14.1.gem
-    filename: multi_json.gem
-    validation:
-      type: sha256
-      value: d971296c0eacea289d31e4a7ab7ac5eda97262c62bbc8c110de4f5e36425c577
   - url: https://rubygems.org/downloads/to_regexp-0.2.1.gem
     filename: to_regexp.gem
     validation:
@@ -122,31 +117,6 @@ resources:
     validation:
       type: sha256
       value: af986793a515d500ab2d35f8d2aecd656e764504b789b66d7e1a0b727a124c44
-  - url: https://rubygems.org/downloads/fluent-plugin-elasticsearch-4.1.3.gem
-    filename: fluent-plugin-elasticsearch.gem
-    validation:
-      type: sha256
-      value: 0095595478cd8197942c1602b908fbee1efa6dd7e36b45ef7080f7a220813af4
-  - url: https://rubygems.org/downloads/elasticsearch-7.9.0.gem
-    filename: elasticsearch.gem
-    validation:
-      type: sha256
-      value: 732e155ae080862465cdf80f8ee38771e9bfd1d1b40b428df3c98106875c6ae2
-  - url: https://rubygems.org/downloads/elasticsearch-api-7.9.0.gem
-    filename: elasticsearch-api.gem
-    validation:
-      type: sha256
-      value: fff8d1367f54a29e7757182c2c46041c85ebe05abfd2d9c364797413d04d535b
-  - url: https://rubygems.org/downloads/elasticsearch-transport-7.9.0.gem
-    filename: elasticsearch-transport.gem
-    validation:
-      type: sha256
-      value: 0af4230c26b18722b1fb792f59597b17faca51b35f7c832d00568973883d88c5
-  - url: https://rubygems.org/downloads/faraday-1.0.1.gem
-    filename: faraday.gem
-    validation:
-      type: sha256
-      value: 381aee04fcc9effbe5fa7cc703d8f5f20293722f987ded4f958f77514cd29373
   - url: https://rubygems.org/downloads/fluent-plugin-record-modifier-2.1.0.gem
     filename: fluent-plugin-record-modifier.gem
     validation:
@@ -197,6 +167,41 @@ resources:
     validation:
       type: sha256
       value: a99967c7b2d1d2eb00e1142e60de06a1a6471e82af574b330e9af375e87c0cf7
+  - url: https://rubygems.org/downloads/faraday-net_http-1.0.1.gem
+    filename: faraday-net_http.gem
+    validation:
+      type: sha256
+      value: 3245ce406ebb77b40e17a77bfa66191dda04be2fd4e13a78d8a4305854d328ba
+  - filename: faraday-1.3.0.gem
+    url: https://rubygems.org/downloads/faraday-1.3.0.gem
+    validation:
+      type: sha256
+      value: 7f06817ba823ddeabf4dd85ca5e0f63e234527f564a03f09f6c7127951d3bac2
+  
+  - filename: ruby2_keywords.gem
+    url: https://rubygems.org/downloads/ruby2_keywords-0.0.4.gem
+    validation:
+      type: sha256
+      value: 3ae3189c2e1d2f60204dcceedf890ff49dd28979771e2576016a3ee73b668e97
+
+
+  - filename: elasticsearch-7.12.0.gem
+    url: https://rubygems.org/downloads/elasticsearch-7.12.0.gem
+    validation:
+      type: sha256
+      value: cd958a5f21793c90fa83db38523e29f3c2f98b7060112b2c0bc9699a29aaa455
+
+  - url: https://rubygems.org/downloads/elasticsearch-transport-7.12.0.gem
+    filename: elasticsearch-transport.gem
+    validation:
+      type: sha256
+      value: 4b10fba2d1ff914ed834ee9f7849e2fdbee794e14bbfb3d09b78609df5cf6392
+
+  - url: https://rubygems.org/downloads/elasticsearch-api-7.12.0.gem
+    filename: elasticsearch-api.gem
+    validation:
+      type: sha256
+      value: 833d0d78dda4a62038fc9716eb51a626d52ecdaa57ecdb3f0aa84db1e324fd13
 
 # List of project maintainers
 maintainers: