From cd4da779ac7e9974f363fbbc5107a58ac380b946 Mon Sep 17 00:00:00 2001 From: Katarzyna Kujawa Date: Mon, 18 Dec 2023 11:17:44 +0100 Subject: [PATCH] chore: rename sidecar image in tests --- Makefile | 2 +- helm/tests/values.withCertManager.yaml | 2 +- helm/tests/values.withFluentBitCustomConfiguration.yaml | 2 +- helm/tests/values.withOtelcolCustomConfiguration.yaml | 2 +- helm/tests/values.yaml | 2 +- kuttl-test-helm-certmanager.yaml | 2 +- kuttl-test-helm-fluentbit-custom-configuration.yaml | 2 +- kuttl-test-helm-otelcol-custom-configuration.yaml | 2 +- kuttl-test-helm.yaml | 2 +- kuttl-test.yaml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 8abb50ea..a9101146 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ login-ecr: .PHONY: e2e e2e: IMG="registry.localhost:5000/sumologic/tailing-sidecar-operator:test" -e2e: TAILING_SIDECAR_IMG = "registry.localhost:5000/sumologic/tailing-sidecar:test" +e2e: TAILING_SIDECAR_IMG = "registry.localhost:5000/sumologic/sidecar:test" e2e: $(MAKE) -C ./sidecar/$(TAILING_SIDECAR) build-test-image TAG=$(TAILING_SIDECAR_IMG) $(MAKE) -C ./operator docker-build IMG=$(IMG) TAILING_SIDECAR_IMG=$(TAILING_SIDECAR_IMG) diff --git a/helm/tests/values.withCertManager.yaml b/helm/tests/values.withCertManager.yaml index 400a2246..20eda7af 100644 --- a/helm/tests/values.withCertManager.yaml +++ b/helm/tests/values.withCertManager.yaml @@ -5,7 +5,7 @@ operator: sidecar: image: - repository: registry.localhost:5000/sumologic/tailing-sidecar + repository: registry.localhost:5000/sumologic/sidecar tag: test resources: limits: diff --git a/helm/tests/values.withFluentBitCustomConfiguration.yaml b/helm/tests/values.withFluentBitCustomConfiguration.yaml index f79c6b6f..65fc7924 100644 --- a/helm/tests/values.withFluentBitCustomConfiguration.yaml +++ b/helm/tests/values.withFluentBitCustomConfiguration.yaml @@ -5,7 +5,7 @@ operator: sidecar: image: - repository: registry.localhost:5000/sumologic/tailing-sidecar + repository: registry.localhost:5000/sumologic/sidecar tag: test resources: diff --git a/helm/tests/values.withOtelcolCustomConfiguration.yaml b/helm/tests/values.withOtelcolCustomConfiguration.yaml index 8158f3e7..54dd6b90 100644 --- a/helm/tests/values.withOtelcolCustomConfiguration.yaml +++ b/helm/tests/values.withOtelcolCustomConfiguration.yaml @@ -5,7 +5,7 @@ operator: sidecar: image: - repository: registry.localhost:5000/sumologic/tailing-sidecar + repository: registry.localhost:5000/sumologic/sidecar tag: test resources: diff --git a/helm/tests/values.yaml b/helm/tests/values.yaml index ab4a47e0..22cbc1a5 100644 --- a/helm/tests/values.yaml +++ b/helm/tests/values.yaml @@ -5,7 +5,7 @@ operator: sidecar: image: - repository: registry.localhost:5000/sumologic/tailing-sidecar + repository: registry.localhost:5000/sumologic/sidecar tag: test resources: diff --git a/kuttl-test-helm-certmanager.yaml b/kuttl-test-helm-certmanager.yaml index e5de68bd..62fbf8f5 100644 --- a/kuttl-test-helm-certmanager.yaml +++ b/kuttl-test-helm-certmanager.yaml @@ -10,7 +10,7 @@ startKIND: true kindNodeCache: true kindContainers: - registry.localhost:5000/sumologic/tailing-sidecar-operator:test - - registry.localhost:5000/sumologic/tailing-sidecar:test + - registry.localhost:5000/sumologic/sidecar:test commands: - command: make -C ./operator deploy-cert-manager - command: helm upgrade --install test-release ./helm/tailing-sidecar-operator -f ./helm/tests/values.withCertManager.yaml -n tailing-sidecar-system --create-namespace diff --git a/kuttl-test-helm-fluentbit-custom-configuration.yaml b/kuttl-test-helm-fluentbit-custom-configuration.yaml index d004f743..ff706260 100644 --- a/kuttl-test-helm-fluentbit-custom-configuration.yaml +++ b/kuttl-test-helm-fluentbit-custom-configuration.yaml @@ -10,7 +10,7 @@ startKIND: true kindNodeCache: true kindContainers: - registry.localhost:5000/sumologic/tailing-sidecar-operator:test - - registry.localhost:5000/sumologic/tailing-sidecar:test + - registry.localhost:5000/sumologic/sidecar:test commands: - command: helm upgrade --install test-release ./helm/tailing-sidecar-operator -f ./helm/tests/values.withFluentBitCustomConfiguration.yaml -n tailing-sidecar-system --create-namespace - command: make e2e-wait-until-operator-ready diff --git a/kuttl-test-helm-otelcol-custom-configuration.yaml b/kuttl-test-helm-otelcol-custom-configuration.yaml index e970c65c..fa04b289 100644 --- a/kuttl-test-helm-otelcol-custom-configuration.yaml +++ b/kuttl-test-helm-otelcol-custom-configuration.yaml @@ -10,7 +10,7 @@ startKIND: true kindNodeCache: true kindContainers: - registry.localhost:5000/sumologic/tailing-sidecar-operator:test - - registry.localhost:5000/sumologic/tailing-sidecar:test + - registry.localhost:5000/sumologic/sidecar:test commands: - command: helm upgrade --install test-release ./helm/tailing-sidecar-operator -f ./helm/tests/values.withOtelcolCustomConfiguration.yaml -n tailing-sidecar-system --create-namespace - command: make e2e-wait-until-operator-ready diff --git a/kuttl-test-helm.yaml b/kuttl-test-helm.yaml index 61906f32..36e2bd13 100644 --- a/kuttl-test-helm.yaml +++ b/kuttl-test-helm.yaml @@ -10,7 +10,7 @@ startKIND: true kindNodeCache: true kindContainers: - registry.localhost:5000/sumologic/tailing-sidecar-operator:test - - registry.localhost:5000/sumologic/tailing-sidecar:test + - registry.localhost:5000/sumologic/sidecar:test commands: - command: helm upgrade --install test-release ./helm/tailing-sidecar-operator -f ./helm/tests/values.yaml -n tailing-sidecar-system --create-namespace diff --git a/kuttl-test.yaml b/kuttl-test.yaml index 8ed89cef..4fe7f66b 100644 --- a/kuttl-test.yaml +++ b/kuttl-test.yaml @@ -10,8 +10,8 @@ startKIND: true kindNodeCache: true kindContainers: - registry.localhost:5000/sumologic/tailing-sidecar-operator:test - - registry.localhost:5000/sumologic/tailing-sidecar:test + - registry.localhost:5000/sumologic/sidecar:test commands: - command: make -C ./operator deploy-cert-manager - - command: make -C ./operator deploy IMG="registry.localhost:5000/sumologic/tailing-sidecar-operator:test" TAILING_SIDECAR_IMG="registry.localhost:5000/sumologic/tailing-sidecar:test" + - command: make -C ./operator deploy IMG="registry.localhost:5000/sumologic/tailing-sidecar-operator:test" TAILING_SIDECAR_IMG="registry.localhost:5000/sumologic/sidecar:test" - command: make e2e-wait-until-operator-ready