Add v1.16.6-1.3 images

Signed-off-by: Kentaro Hayashi <[email protected]>

README.md

@@ -25,130 +25,130 @@ If you want to use above non published images, build it by yourself. Dockerfile
 
 ##### Multi-Arch images
 - `Azureblob`
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-2`
 - `Elasticsearch8`
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-2`
 - `Elasticsearch7`
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-2`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch`
 - `Opensearch`
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-2`
 - `Cloudwatch`
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-2`
 - `Forward`
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-2`
 - `Gcs`
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-2`
 - `Graylog`
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-2`
 - `Kafka`
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka-2`
 - `Kafka2`
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka2-2`
 - `Kinesis`
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-2`
 
 ##### x86_64 images
 - `Azureblob` [Dockerfile](docker-image/v1.16/debian-azureblob/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-amd64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-amd64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-amd64-2`
 - `Elasticsearch8` [Dockerfile](docker-image/v1.16/debian-elasticsearch8/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-amd64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-amd64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-amd64-2`
 - `Elasticsearch7` [Dockerfile](docker-image/v1.16/debian-elasticsearch7/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-amd64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-amd64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-amd64-2`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch-amd64`
 - `Opensearch` [Dockerfile](docker-image/v1.16/debian-opensearch/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-amd64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-amd64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-amd64-2`
 - `Loggly` [Dockerfile](docker-image/v1.16/debian-loggly/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-loggly-amd64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-loggly-amd64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-loggly-amd64-2`
 - `Logentries` [Dockerfile](docker-image/v1.16/debian-logentries/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-logentries-amd64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-logentries-amd64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-logentries-amd64-2`
 - `Cloudwatch` [Dockerfile](docker-image/v1.16/debian-cloudwatch/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-amd64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-amd64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-amd64-2`
 - `S3` [Dockerfile](docker-image/v1.16/debian-s3/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-s3-amd64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-s3-amd64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-s3-amd64-2`
 - `Syslog` [Dockerfile](docker-image/v1.16/debian-syslog/Dockerfile)
 - `Forward` [Dockerfile](docker-image/v1.16/debian-forward/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-amd64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-amd64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-amd64-2`
 - `Gcs` [Dockerfile](docker-image/v1.16/debian-gcs/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-amd64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-amd64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-amd64-2`
 - `Graylog` [Dockerfile](docker-image/v1.16/debian-graylog/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-amd64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-amd64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-amd64-2`
 - `Papertrail` [Dockerfile](docker-image/v1.16/debian-papertrail/Dockerfile)
 - `Logzio` [Dockerfile](docker-image/v1.16/debian-logzio/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-logzio-amd64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-logzio-amd64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-logzio-amd64-2`
 - `Kafka` [Dockerfile](docker-image/v1.16/debian-kafka/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-amd64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-amd64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka-amd64-2`
 - `Kafka2` [Dockerfile](docker-image/v1.16/debian-kafka2/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-amd64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-amd64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka2-amd64-2`
 - `Kinesis` [Dockerfile](docker-image/v1.16/debian-kinesis/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-amd64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-amd64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-amd64-2`
 
 ##### arm64 images
 - `Azureblob` [Dockerfile](docker-image/v1.16/arm64/debian-azureblob/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-arm64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-arm64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-arm64-2`
 - `Elasticsearch8` [Dockerfile](docker-image/v1.16/arm64/debian-elasticsearch8/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-arm64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-arm64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-arm64-2`
 - `Elasticsearch7` [Dockerfile](docker-image/v1.16/arm64/debian-elasticsearch7/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-arm64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-arm64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-arm64-2`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch-arm64`
 - `Opensearch` [Dockerfile](docker-image/v1.16/arm64/debian-opensearch/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-arm64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-arm64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-arm64-2`
 - `Loggly` [Dockerfile](docker-image/v1.16/arm64/debian-loggly/Dockerfile)
 - `Logentries` [Dockerfile](docker-image/v1.16/arm64/debian-logentries/Dockerfile)
 - `Cloudwatch` [Dockerfile](docker-image/v1.16/arm64/debian-cloudwatch/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-arm64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-arm64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-arm64-2`
 - `S3` [Dockerfile](docker-image/v1.16/arm64/debian-s3/Dockerfile)
 - `Syslog` [Dockerfile](docker-image/v1.16/arm64/debian-syslog/Dockerfile)
 - `Forward` [Dockerfile](docker-image/v1.16/arm64/debian-forward/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-arm64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-arm64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-arm64-2`
 - `Gcs` [Dockerfile](docker-image/v1.16/arm64/debian-gcs/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-arm64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-arm64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-arm64-2`
 - `Graylog` [Dockerfile](docker-image/v1.16/arm64/debian-graylog/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-arm64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-arm64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-arm64-2`
 - `Papertrail` [Dockerfile](docker-image/v1.16/arm64/debian-papertrail/Dockerfile)
 - `Logzio` [Dockerfile](docker-image/v1.16/arm64/debian-logzio/Dockerfile)
 - `Kafka` [Dockerfile](docker-image/v1.16/arm64/debian-kafka/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-arm64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-arm64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka-arm64-2`
 - `Kafka2` [Dockerfile](docker-image/v1.16/arm64/debian-kafka2/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-arm64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-arm64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka2-arm64-2`
 - `Kinesis` [Dockerfile](docker-image/v1.16/arm64/debian-kinesis/Dockerfile)
-  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-arm64-1.2`
+  - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-arm64-1.3`
   - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-arm64-2`
 
 

docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock

@@ -18,9 +18,9 @@ GEM
       fiber-annotation
       fiber-local
       json
-    cool.io (1.8.1)
+    cool.io (1.9.0)
     domain_name (0.6.20240107)
-    faraday (1.10.3)
+    faraday (1.10.4)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -36,14 +36,14 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
+    faraday_middleware (1.2.1)
       faraday (~> 1.0)
     ffi (1.17.0)
     ffi-compiler (1.3.2)
@@ -60,8 +60,8 @@ GEM
       fluentd (>= 0.14.10, < 2)
     fluent-plugin-concat (2.5.0)
       fluentd (>= 0.14.0, < 2)
-    fluent-plugin-detect-exceptions (0.0.15)
-      fluentd (>= 0.10)
+    fluent-plugin-detect-exceptions (0.0.16)
+      fluentd (>= 1.14.2)
     fluent-plugin-grok-parser (2.6.2)
       fluentd (>= 0.14.6, < 2)
     fluent-plugin-json-in-json-2 (1.0.2)
@@ -106,11 +106,11 @@ GEM
       http-form_data (~> 2.2)
       llhttp-ffi (~> 0.5.0)
     http-accept (1.7.0)
-    http-cookie (1.0.7)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     http_parser.rb (0.8.0)
-    json (2.7.2)
+    json (2.9.1)
     jsonpath (1.1.5)
       multi_json
     kubeclient (4.12.0)
@@ -121,27 +121,31 @@ GEM
     llhttp-ffi (0.5.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
+    logger (1.6.4)
     lru_redux (1.1.0)
-    mime-types (3.5.2)
+    mime-types (3.6.0)
+      logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0903)
-    mini_portile2 (2.8.7)
-    msgpack (1.7.2)
+    mime-types-data (3.2024.1203)
+    mini_portile2 (2.8.8)
+    msgpack (1.7.5)
     multi_json (1.15.0)
     multipart-post (2.4.1)
-    net-http-persistent (4.0.4)
+    net-http-persistent (4.0.5)
       connection_pool (~> 2.2)
     netrc (0.11.0)
-    nokogiri (1.16.7)
+    nokogiri (1.17.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.15.1)
+    ostruct (0.6.1)
     prometheus-client (4.2.3)
       base64
     public_suffix (6.0.1)
     racc (1.8.1)
     rake (13.2.1)
-    recursive-open-struct (1.2.2)
+    recursive-open-struct (1.3.1)
+      ostruct
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -150,18 +154,20 @@ GEM
     rexml (3.2.9)
       strscan
     ruby2_keywords (0.0.5)
-    serverengine (2.3.2)
+    serverengine (2.4.0)
+      base64 (~> 0.1)
+      logger (~> 1.4)
       sigdump (~> 0.2.2)
     sigdump (0.2.5)
     strptime (0.2.5)
-    strscan (3.1.0)
+    strscan (3.1.2)
     systemd-journal (2.0.0)
       ffi (~> 1.9)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     tzinfo-data (1.2024.2)
       tzinfo (>= 1.0.0)
-    webrick (1.8.1)
+    webrick (1.9.1)
     yajl-ruby (1.4.3)
 
 PLATFORMS

docker-image/v1.16/arm64/debian-azureblob/conf/kubernetes.conf

@@ -27,7 +27,7 @@
 <filter kubernetes.**>
   @type kubernetes_metadata
   @id filter_kube_metadata
-  kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}"
+  kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}"
   verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}"
   ca_file "#{ENV['KUBERNETES_CA_FILE']}"
   skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}"

docker-image/v1.16/arm64/debian-azureblob/hooks/post_push

@@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download
 chmod +x manifest-tool
 
 # Tag and push image and manifest list for each additional tag
-for tag in {v1.16.6-debian-azureblob-arm64-1.2,v1.16-debian-azureblob-arm64-2}; do
+for tag in {v1.16.6-debian-azureblob-arm64-1.3,v1.16-debian-azureblob-arm64-2}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
   # Note: this will fail until both the amd64 and arm64 images have been pushed