From f617270102275ead69bae0a03c0a6e374dd95213 Mon Sep 17 00:00:00 2001 From: Adam Boguszewski Date: Tue, 16 Aug 2022 17:26:23 +0200 Subject: [PATCH] chore: update kubernetes-tools to 2.12.0 --- CHANGELOG.md | 2 ++ ci/_build_functions.sh | 2 +- deploy/docs/Kube-Prometheus.md | 4 ++-- deploy/docs/Non_Helm_Installation.md | 14 +++++++------- deploy/docs/additional_prometheus_configuration.md | 4 ++-- deploy/docs/standAlonePrometheus.md | 4 ++-- deploy/docs/v2_migration_doc.md | 4 ++-- tests/helm/functions.sh | 4 ++-- tests/integration/internal/constants.go | 2 +- tests/integration/yamls/receiver-mock.yaml | 2 +- vagrant/k8s/istio-receiver-mock.yaml | 2 +- vagrant/k8s/logs-generator.yaml | 2 +- vagrant/k8s/receiver-mock.yaml | 2 +- 13 files changed, 25 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80d3aeb93c..ef2ea8864a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,9 +14,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - chore: upgrade sumologic terraform provider to 2.18 [#2399] +- chore: update kubernetes-tools to 2.12.0 [#2472] [#2466]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2466 [#2399]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2399 +[#2472]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2472 [Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.14.1...main ## [v2.14.1] diff --git a/ci/_build_functions.sh b/ci/_build_functions.sh index a8d248f76c..df6ed117b2 100755 --- a/ci/_build_functions.sh +++ b/ci/_build_functions.sh @@ -12,7 +12,7 @@ function helm() { docker run --rm \ -v "$(pwd):/chart" \ -w /chart \ - sumologic/kubernetes-tools:2.9.0 \ + sumologic/kubernetes-tools:2.12.0 \ helm "$@" } diff --git a/deploy/docs/Kube-Prometheus.md b/deploy/docs/Kube-Prometheus.md index baaef76731..0ff6314479 100644 --- a/deploy/docs/Kube-Prometheus.md +++ b/deploy/docs/Kube-Prometheus.md @@ -9,12 +9,12 @@ You can generate mixin configuration using `kubectl` or `docker`: kubectl run tools \ -it --quiet --rm \ --restart=Never -n sumologic \ - --image sumologic/kubernetes-tools:2.9.0 \ + --image sumologic/kubernetes-tools:2.12.0 \ -- template-prometheus-mixin > kube-prometheus-sumo-logic-mixin.libsonnet # or using docker docker run -it --rm \ - sumologic/kubernetes-tools:2.9.0 \ + sumologic/kubernetes-tools:2.12.0 \ template-prometheus-mixin > kube-prometheus-sumo-logic-mixin.libsonnet ``` diff --git a/deploy/docs/Non_Helm_Installation.md b/deploy/docs/Non_Helm_Installation.md index a3c5f7a85a..6d76b38594 100644 --- a/deploy/docs/Non_Helm_Installation.md +++ b/deploy/docs/Non_Helm_Installation.md @@ -91,7 +91,7 @@ First you will generate the YAML to apply to your cluster. The following comman kubectl run tools \ -i --quiet --rm \ --restart=Never \ - --image sumologic/kubernetes-tools:2.9.0 -- \ + --image sumologic/kubernetes-tools:2.12.0 -- \ template \ --name-template 'collection' \ --set sumologic.accessId='' \ @@ -128,7 +128,7 @@ The following will render the YAML and install in the `my-namespace` namespace. kubectl run tools \ -i --quiet --rm \ --restart=Never \ - --image sumologic/kubernetes-tools:2.9.0 -- \ + --image sumologic/kubernetes-tools:2.12.0 -- \ template \ --namespace 'my-namespace' \ --name-template 'collection' \ @@ -177,7 +177,7 @@ you can do the following: kubectl run tools \ -i --quiet --rm \ --restart=Never \ - --image sumologic/kubernetes-tools:2.9.0 -- \ + --image sumologic/kubernetes-tools:2.12.0 -- \ template \ --namespace 'my-namespace' \ --name-template 'collection' \ @@ -258,7 +258,7 @@ cat sumo-values.yaml | \ kubectl run tools \ -i --quiet --rm \ --restart=Never \ - --image sumologic/kubernetes-tools:2.9.0 -- \ + --image sumologic/kubernetes-tools:2.12.0 -- \ template \ --name-template 'collection' \ | tee sumologic.yaml @@ -279,7 +279,7 @@ You can use the same commands used to create the YAML in the first place. kubectl run tools \ -i --quiet --rm \ --restart=Never \ - --image sumologic/kubernetes-tools:2.9.0 -- \ + --image sumologic/kubernetes-tools:2.12.0 -- \ template \ --namespace 'my-namespace' \ --name-template 'collection' \ @@ -297,7 +297,7 @@ cat sumo-values.yaml | \ kubectl run tools \ -i --quiet --rm \ --restart=Never \ - --image sumologic/kubernetes-tools:2.9.0 -- \ + --image sumologic/kubernetes-tools:2.12.0 -- \ template \ --name-template 'collection' \ | tee sumologic.yaml @@ -312,7 +312,7 @@ cat values.yaml | \ kubectl run tools \ -i --quiet --rm \ --restart=Never \ - --image sumologic/kubernetes-tools:2.9.0 -- \ + --image sumologic/kubernetes-tools:2.12.0 -- \ template \ --name-template 'collection' \ --version=1.0.0 diff --git a/deploy/docs/additional_prometheus_configuration.md b/deploy/docs/additional_prometheus_configuration.md index 1b0ed73726..e481101ab4 100644 --- a/deploy/docs/additional_prometheus_configuration.md +++ b/deploy/docs/additional_prometheus_configuration.md @@ -12,12 +12,12 @@ using `docker`/`kubectl` and [sumologic-kubernetes-tools](https://github.com/sum kubectl run tools \ -it --quiet --rm \ --restart=Never -n sumologic \ - --image sumologic/kubernetes-tools:2.9.0 \ + --image sumologic/kubernetes-tools:2.12.0 \ -- template-dependency kube-prometheus-stack > prometheus-overrides.yaml # or using docker docker run -it --rm \ - sumologic/kubernetes-tools:2.9.0 \ + sumologic/kubernetes-tools:2.12.0 \ template-dependency kube-prometheus-stack > prometheus-overrides.yaml ``` diff --git a/deploy/docs/standAlonePrometheus.md b/deploy/docs/standAlonePrometheus.md index afbbe1bd6a..cea5da5cc4 100644 --- a/deploy/docs/standAlonePrometheus.md +++ b/deploy/docs/standAlonePrometheus.md @@ -113,12 +113,12 @@ First, generate the Prometheus Operator `prometheus-overrides.yaml` by running kubectl run tool \ -it --quiet --rm \ --restart=Never -n sumologic \ - --image sumologic/kubernetes-tools:2.9.0 \ + --image sumologic/kubernetes-tools:2.12.0 \ -- template-dependency kube-prometheus-stack > prometheus-overrides.yaml # or using Docker docker run -it --rm \ - sumologic/kubernetes-tools:2.9.0 \ + sumologic/kubernetes-tools:2.12.0 \ template-dependency kube-prometheus-stack > prometheus-overrides.yaml ``` diff --git a/deploy/docs/v2_migration_doc.md b/deploy/docs/v2_migration_doc.md index 4f463cef38..8e258dc542 100644 --- a/deploy/docs/v2_migration_doc.md +++ b/deploy/docs/v2_migration_doc.md @@ -352,7 +352,7 @@ to convert their existing `values.yaml` file into one that is compatible with th cat current_values.yaml | \ docker run \ --rm \ - -i sumologic/kubernetes-tools:2.9.0 upgrade-2.0 | \ + -i sumologic/kubernetes-tools:2.12.0 upgrade-2.0 | \ tee new_values.yaml ``` @@ -367,7 +367,7 @@ to convert their existing `values.yaml` file into one that is compatible with th --quiet \ --rm \ --restart=Never \ - --image sumologic/kubernetes-tools:2.9.0 -- upgrade-2.0 | \ + --image sumologic/kubernetes-tools:2.12.0 -- upgrade-2.0 | \ tee new_values.yaml ``` diff --git a/tests/helm/functions.sh b/tests/helm/functions.sh index 38b7bf6f61..465ac007b4 100644 --- a/tests/helm/functions.sh +++ b/tests/helm/functions.sh @@ -38,7 +38,7 @@ function prepare_environment() { rm -rf "${repo_path}/tmpcharts" docker run --rm \ -v "${repo_path}":/chart \ - sumologic/kubernetes-tools:2.9.0 \ + sumologic/kubernetes-tools:2.12.0 \ helm dependency update /chart } @@ -77,7 +77,7 @@ function generate_file { if ! docker run --rm \ -v "${TEST_SCRIPT_PATH}/../../../deploy/helm/sumologic":/chart \ -v "${TEST_STATICS_PATH}/${input_file}":/values.yaml \ - sumologic/kubernetes-tools:2.9.0 \ + sumologic/kubernetes-tools:2.12.0 \ helm template /chart -f /values.yaml \ ${kube_api_versions_flags} \ --namespace sumologic \ diff --git a/tests/integration/internal/constants.go b/tests/integration/internal/constants.go index 69115be433..2f16049335 100644 --- a/tests/integration/internal/constants.go +++ b/tests/integration/internal/constants.go @@ -25,7 +25,7 @@ const ( LogsGeneratorNamespace = "logs-generator" LogsGeneratorName = "logs-generator" - LogsGeneratorImage = "sumologic/kubernetes-tools:2.9.0" + LogsGeneratorImage = "sumologic/kubernetes-tools:2.12.0" MultilineLogsNamespace = "multiline-logs-generator" MultilineLogsPodName = "multiline-logs-generator" diff --git a/tests/integration/yamls/receiver-mock.yaml b/tests/integration/yamls/receiver-mock.yaml index b56afaa790..2ffa67c30b 100644 --- a/tests/integration/yamls/receiver-mock.yaml +++ b/tests/integration/yamls/receiver-mock.yaml @@ -26,7 +26,7 @@ spec: - ports: - containerPort: 3000 - containerPort: 3001 - image: sumologic/kubernetes-tools:2.9.0 + image: sumologic/kubernetes-tools:2.12.0 name: receiver-mock args: - receiver-mock diff --git a/vagrant/k8s/istio-receiver-mock.yaml b/vagrant/k8s/istio-receiver-mock.yaml index 539440b09e..9687adf9fe 100644 --- a/vagrant/k8s/istio-receiver-mock.yaml +++ b/vagrant/k8s/istio-receiver-mock.yaml @@ -29,7 +29,7 @@ spec: - ports: - containerPort: 3000 - containerPort: 3001 - image: sumologic/kubernetes-tools:2.9.0 + image: sumologic/kubernetes-tools:2.12.0 name: receiver-mock args: - receiver-mock diff --git a/vagrant/k8s/logs-generator.yaml b/vagrant/k8s/logs-generator.yaml index 495ac9c430..5773bb00ce 100644 --- a/vagrant/k8s/logs-generator.yaml +++ b/vagrant/k8s/logs-generator.yaml @@ -21,7 +21,7 @@ spec: name: logs-generator spec: containers: - - image: sumologic/kubernetes-tools:2.9.0 + - image: sumologic/kubernetes-tools:2.12.0 imagePullPolicy: Always name: logs-generator command: diff --git a/vagrant/k8s/receiver-mock.yaml b/vagrant/k8s/receiver-mock.yaml index 4afb09d560..ac0dc2a1a7 100644 --- a/vagrant/k8s/receiver-mock.yaml +++ b/vagrant/k8s/receiver-mock.yaml @@ -30,7 +30,7 @@ spec: - ports: - containerPort: 3000 - containerPort: 3001 - image: sumologic/kubernetes-tools:2.9.0 + image: sumologic/kubernetes-tools:2.12.0 name: receiver-mock args: - receiver-mock