From c0df026db7b99a0c9abdcd6dc479b4e38de30ad4 Mon Sep 17 00:00:00 2001 From: Moritz Clasmeier <111092021+mclasmeier@users.noreply.github.com> Date: Tue, 12 Mar 2024 08:59:09 +0100 Subject: [PATCH] ROX-21937: Remove stackrox.io references (#10265) Co-authored-by: Moritz Clasmeier --- Makefile | 4 +- README.md | 4 +- central/clusters/deployer_test.go | 1 - image/embed_charts_test.go | 1 - .../values-public.yaml.example.htpl | 2 +- .../values-public.yaml.example | 2 +- operator/Makefile | 2 +- pkg/helm/charts/meta_test.go | 1 - .../centralservices/flavor/flavor_test.go | 5 +- .../flavor/flavor_test.go | 3 +- pkg/images/defaults/env.go | 2 - pkg/images/defaults/flavor.go | 46 ------------------- pkg/images/defaults/flavor_test.go | 8 +--- pkg/images/defaults/testutils/flavor_test.go | 1 - pkg/kubernetes/pull_secret_test.go | 1 + pkg/renderer/templates/public_values.yaml.tpl | 8 ++-- roxctl/central/generate/generate_test.go | 6 +-- roxctl/helm/output/output_lint_test.go | 3 -- .../kubernetes/listener/resources/convert.go | 2 +- .../sensor-generate-image-overrides.bats | 10 ++-- tests/roxctl/bats-tests/helpers.bash | 7 --- .../local/central-generate-development.bats | 24 ++++------ .../central-generate-interactive-flavors.bats | 30 ++++++------ .../local/central-generate-release.bats | 24 ++++------ .../expect/flavor-interactive.expect.tcl | 8 ++-- ...oxctl-helm-output-central-development.bats | 17 ++----- .../roxctl-helm-output-central-release.bats | 11 +---- ...-secured-cluster-services-development.bats | 15 ------ ...tput-secured-cluster-services-release.bats | 15 ------ .../clusters/certExpirationDegraded.json | 2 +- 30 files changed, 68 insertions(+), 197 deletions(-) diff --git a/Makefile b/Makefile index 67503edd57590..59899346b04f9 100644 --- a/Makefile +++ b/Makefile @@ -39,8 +39,8 @@ endif ROX_PRODUCT_BRANDING ?= STACKROX_BRANDING -# ROX_IMAGE_FLAVOR is an ARG used in Dockerfiles that defines the default registries for main, scaner, and collector images. -# ROX_IMAGE_FLAVOR valid values are: development_build, stackrox.io, rhacs, opensource. +# ROX_IMAGE_FLAVOR is an ARG used in Dockerfiles that defines the default registries for main, scanner, and collector images. +# ROX_IMAGE_FLAVOR valid values are: development_build, rhacs, opensource. ROX_IMAGE_FLAVOR ?= $(shell \ if [[ "$(ROX_PRODUCT_BRANDING)" == "STACKROX_BRANDING" ]]; then \ echo "opensource"; \ diff --git a/README.md b/README.md index 4bcb53a1a165d..6cbe2ebb21709 100644 --- a/README.md +++ b/README.md @@ -555,7 +555,7 @@ more info.
Kubernetes ```bash -docker run -i --rm stackrox.io/main: interactive > k8s.zip +docker run -i --rm quay.io/stackrox-io/main: central generate interactive > k8s.zip ``` This will run you through an installer and generate a `k8s.zip` file. @@ -585,7 +585,7 @@ bash image-setup.sh ``` ```bash -docker run -i --rm stackrox.io/main: interactive > openshift.zip +docker run -i --rm quay.io/stackrox-io/main: central generate interactive > openshift.zip ``` This will run you through an installer and generate a `openshift.zip` file. diff --git a/central/clusters/deployer_test.go b/central/clusters/deployer_test.go index 88e2cfc9b5abb..1ab6ad2f036b1 100644 --- a/central/clusters/deployer_test.go +++ b/central/clusters/deployer_test.go @@ -327,7 +327,6 @@ func testImageFlavorChartRepoSettings(s *deployerTestSuite, flavor defaults.Imag func (s *deployerTestSuite) TestFieldsFromClusterAndRenderOpts() { flavorCases := map[string]defaults.ImageFlavor{ "development": defaults.DevelopmentBuildImageFlavor(), - "stackrox": defaults.StackRoxIOReleaseImageFlavor(), "rhacs": defaults.RHACSReleaseImageFlavor(), "opensource": defaults.OpenSourceImageFlavor(), } diff --git a/image/embed_charts_test.go b/image/embed_charts_test.go index 273b8e8d009ae..eb357a18b4e72 100644 --- a/image/embed_charts_test.go +++ b/image/embed_charts_test.go @@ -58,7 +58,6 @@ func (s *embedTestSuite) TestLoadChartForFlavor() { testCases := []defaults.ImageFlavor{ flavorUtils.MakeImageFlavorForTest(s.T()), defaults.DevelopmentBuildImageFlavor(), - defaults.StackRoxIOReleaseImageFlavor(), defaults.RHACSReleaseImageFlavor(), defaults.OpenSourceImageFlavor(), } diff --git a/image/templates/helm/stackrox-central/values-public.yaml.example.htpl b/image/templates/helm/stackrox-central/values-public.yaml.example.htpl index 47714cd2f4342..a79ada2f6c665 100644 --- a/image/templates/helm/stackrox-central/values-public.yaml.example.htpl +++ b/image/templates/helm/stackrox-central/values-public.yaml.example.htpl @@ -45,7 +45,7 @@ # # The registry relative to which all image references are resolved, unless # # a specific registry is provided for particular workloads which takes precedence # # (see `central.image`, `db.image`, `scanner.image`, and `scanner.dbImage` below). -# # This can be just a registry hostname such as `stackrox.io`, or a registry hostname with +# # This can be just a registry hostname such as `quay.io`, or a registry hostname with # # a "remote" component such as `us.gcr.io/my-stackrox-mirror`. # registry: us.gcr.io/my-stackrox-mirror # diff --git a/image/templates/helm/stackrox-secured-cluster/values-public.yaml.example b/image/templates/helm/stackrox-secured-cluster/values-public.yaml.example index a5d0fb824a6f6..32c257d904afe 100644 --- a/image/templates/helm/stackrox-secured-cluster/values-public.yaml.example +++ b/image/templates/helm/stackrox-secured-cluster/values-public.yaml.example @@ -102,7 +102,7 @@ # registry: null # if set to null, use `image.registry` # name: main # the final image name is composed of the registry and the name, plus the tag below # tag: null # should be left as null - will get picked up from the Chart version. -# fullRef: null # you can set a full image reference such as stackrox.io/main:1.2.3.4 here, but this is not +# fullRef: null # you can set a full image reference such as quay.io/stackrox-io/main:1.2.3.4 here, but this is not # # recommended. # # The default pull policy for this image. Can be overridden for each individual service. # pullPolicy: IfNotPresent diff --git a/operator/Makefile b/operator/Makefile index b758e67d0fc0e..dc554dd30fcba 100644 --- a/operator/Makefile +++ b/operator/Makefile @@ -106,7 +106,7 @@ KUTTL_TEST_RUN_LABELS_ARGS ?= --test-run-labels openshift=$(TEST_E2E_ENV_IS_OPEN ENABLE_WEBHOOKS ?= false # ROX_IMAGE_FLAVOR is an ARG used in Dockerfiles that defines the default registries for main, scanner, and collector images. -# ROX_IMAGE_FLAVOR valid values are: development_build, stackrox.io, rhacs. +# ROX_IMAGE_FLAVOR valid values are: development_build, opensource, rhacs. # Use the value figured in the parent directory Makefile, unless provided explicitly in the environment. ROX_IMAGE_FLAVOR ?= $(shell $(MAKE) --quiet --no-print-directory -C .. image-flavor) diff --git a/pkg/helm/charts/meta_test.go b/pkg/helm/charts/meta_test.go index 0e25a2cec67c2..5f3ee46fae89e 100644 --- a/pkg/helm/charts/meta_test.go +++ b/pkg/helm/charts/meta_test.go @@ -17,7 +17,6 @@ func TestRequiredMetaValuesArePresent(t *testing.T) { cases := []defaults.ImageFlavor{ defaults.DevelopmentBuildImageFlavor(), - defaults.StackRoxIOReleaseImageFlavor(), defaults.RHACSReleaseImageFlavor(), defaults.OpenSourceImageFlavor(), } diff --git a/pkg/helm/charts/tests/centralservices/flavor/flavor_test.go b/pkg/helm/charts/tests/centralservices/flavor/flavor_test.go index 2ab19214a1545..b105a1066645f 100644 --- a/pkg/helm/charts/tests/centralservices/flavor/flavor_test.go +++ b/pkg/helm/charts/tests/centralservices/flavor/flavor_test.go @@ -56,9 +56,8 @@ func TestOverriddenTagsAreRenderedInTheChart(t *testing.T) { func TestWithDifferentImageFlavors(t *testing.T) { testutils.SetVersion(t, testutils.GetExampleVersion(t)) imageFlavorCases := map[string]defaults.ImageFlavor{ - "stackrox": defaults.StackRoxIOReleaseImageFlavor(), - "rhacs": defaults.RHACSReleaseImageFlavor(), - "custom": customFlavor(t), + "rhacs": defaults.RHACSReleaseImageFlavor(), + "custom": customFlavor(t), } if buildinfo.ReleaseBuild { imageFlavorCases["development_build-release"] = defaults.DevelopmentBuildImageFlavor() diff --git a/pkg/helm/charts/tests/securedclusterservices/flavor/flavor_test.go b/pkg/helm/charts/tests/securedclusterservices/flavor/flavor_test.go index 0ad91649d598d..04c29a7bbd43a 100644 --- a/pkg/helm/charts/tests/securedclusterservices/flavor/flavor_test.go +++ b/pkg/helm/charts/tests/securedclusterservices/flavor/flavor_test.go @@ -32,8 +32,7 @@ func TestOverriddenTagsAreRenderedInTheChart(t *testing.T) { func TestWithDifferentImageFlavors(t *testing.T) { testutils.SetVersion(t, testutils.GetExampleVersion(t)) imageFlavorCases := map[string]defaults.ImageFlavor{ - "stackrox": defaults.StackRoxIOReleaseImageFlavor(), - "rhacs": defaults.RHACSReleaseImageFlavor(), + "rhacs": defaults.RHACSReleaseImageFlavor(), } if buildinfo.ReleaseBuild { imageFlavorCases["development_build-release"] = defaults.DevelopmentBuildImageFlavor() diff --git a/pkg/images/defaults/env.go b/pkg/images/defaults/env.go index 04dc87b81e7df..ceb1a92404df3 100644 --- a/pkg/images/defaults/env.go +++ b/pkg/images/defaults/env.go @@ -12,8 +12,6 @@ const ( // unrelated to the image flavor. It is possible that binaries compiled in release mode are packaged in images that // have development_build image flavor. ImageFlavorNameDevelopmentBuild = "development_build" - // ImageFlavorNameStackRoxIORelease is a name for image flavor (image defaults) for images released to stackrox.io. - ImageFlavorNameStackRoxIORelease = "stackrox.io" // ImageFlavorNameRHACSRelease is a name for image flavor (image defaults) for images released to registry.redhat.io. ImageFlavorNameRHACSRelease = "rhacs" // ImageFlavorNameOpenSource is a name for image flavor (image defaults) for images released to quay.io/stackrox-io. diff --git a/pkg/images/defaults/flavor.go b/pkg/images/defaults/flavor.go index 51163da70dc3f..37985ab296e52 100644 --- a/pkg/images/defaults/flavor.go +++ b/pkg/images/defaults/flavor.go @@ -33,12 +33,6 @@ var ( isVisibleInReleaseBuild: false, constructorFunc: DevelopmentBuildImageFlavor, }, - { - // TODO(ROX-11642): This was just hidden in release builds but should go away completely. - imageFlavorName: ImageFlavorNameStackRoxIORelease, - isVisibleInReleaseBuild: false, - constructorFunc: StackRoxIOReleaseImageFlavor, - }, { imageFlavorName: ImageFlavorNameRHACSRelease, isVisibleInReleaseBuild: true, @@ -81,7 +75,6 @@ type ImageFlavor struct { CentralDBImageTag string CentralDBImageName string - // CollectorRegistry may be different from MainRegistry in case of stackrox.io. CollectorRegistry string CollectorImageName string CollectorImageTag string @@ -152,45 +145,6 @@ func DevelopmentBuildImageFlavor() ImageFlavor { } } -// StackRoxIOReleaseImageFlavor returns image values for `stackrox.io` flavor. -// TODO(ROX-11642): remove stackrox.io flavor as stackrox.io image distribution is shut down. -func StackRoxIOReleaseImageFlavor() ImageFlavor { - v := version.GetAllVersionsUnified() - return ImageFlavor{ - MainRegistry: "stackrox.io", - MainImageName: "main", - MainImageTag: v.MainVersion, - CentralDBImageTag: v.MainVersion, - CentralDBImageName: "central-db", - - CollectorRegistry: "collector.stackrox.io", - CollectorImageName: "collector", - CollectorImageTag: v.CollectorVersion, - CollectorSlimImageName: "collector-slim", - CollectorSlimImageTag: v.CollectorVersion, - - ScannerImageName: "scanner", - ScannerSlimImageName: "scanner-slim", - ScannerImageTag: v.ScannerVersion, - ScannerDBImageName: "scanner-db", - ScannerDBSlimImageName: "scanner-db-slim", - - ScannerV4ImageName: "scanner-v4", - ScannerV4DBImageName: "scanner-v4-db", - // Scanner v4 is released along with the main image, so the tags are expected to be the same. - ScannerV4ImageTag: v.MainVersion, - - ChartRepo: ChartRepo{ - URL: "https://charts.stackrox.io", - IconURL: "https://raw.githubusercontent.com/stackrox/stackrox/master/image/templates/helm/shared/assets/Red_Hat-Hat_icon.png", - }, - ImagePullSecrets: ImagePullSecrets{ - AllowNone: false, - }, - Versions: v, - } -} - // RHACSReleaseImageFlavor returns image values for `rhacs` flavor. func RHACSReleaseImageFlavor() ImageFlavor { v := version.GetAllVersionsUnified() diff --git a/pkg/images/defaults/flavor_test.go b/pkg/images/defaults/flavor_test.go index 12b476c91434c..86c121845f6ec 100644 --- a/pkg/images/defaults/flavor_test.go +++ b/pkg/images/defaults/flavor_test.go @@ -37,9 +37,6 @@ func (s *imageFlavorTestSuite) TestGetImageFlavorFromEnv() { "development_build": { expectedFlavor: DevelopmentBuildImageFlavor(), }, - "stackrox.io": { - expectedFlavor: StackRoxIOReleaseImageFlavor(), - }, "rhacs": { expectedFlavor: RHACSReleaseImageFlavor(), }, @@ -144,9 +141,6 @@ func (s *imageFlavorTestSuite) TestGetImageFlavorByName() { "development_build": { expectedFlavor: DevelopmentBuildImageFlavor(), }, - "stackrox.io": { - expectedFlavor: StackRoxIOReleaseImageFlavor(), - }, "rhacs": { expectedFlavor: RHACSReleaseImageFlavor(), }, @@ -185,7 +179,7 @@ func TestGetVisibleImageFlavorNames(t *testing.T) { isRelease bool want []string }{ - {"development", false, []string{"development_build", "stackrox.io", "rhacs", "opensource"}}, + {"development", false, []string{"development_build", "rhacs", "opensource"}}, {"release", true, []string{"rhacs", "opensource"}}, } for _, tt := range tests { diff --git a/pkg/images/defaults/testutils/flavor_test.go b/pkg/images/defaults/testutils/flavor_test.go index db8c6faa8a303..172d4754de508 100644 --- a/pkg/images/defaults/testutils/flavor_test.go +++ b/pkg/images/defaults/testutils/flavor_test.go @@ -15,7 +15,6 @@ func TestFlavorsDontHaveEmptyFields(t *testing.T) { flavors := []defaults.ImageFlavor{ defaults.DevelopmentBuildImageFlavor(), - defaults.StackRoxIOReleaseImageFlavor(), defaults.RHACSReleaseImageFlavor(), defaults.OpenSourceImageFlavor(), MakeImageFlavorForTest(t), diff --git a/pkg/kubernetes/pull_secret_test.go b/pkg/kubernetes/pull_secret_test.go index 311e974432cdc..9dcd066e696d2 100644 --- a/pkg/kubernetes/pull_secret_test.go +++ b/pkg/kubernetes/pull_secret_test.go @@ -15,6 +15,7 @@ func TestResolvedRegistry(t *testing.T) { {image: "library/nginx", expected: "https://docker.io"}, {image: "docker.io/library/nginx:latest", expected: "https://docker.io"}, {image: "stackrox.io/main:1.10", expected: "https://stackrox.io"}, + {image: "quay.io/stackrox-io/main:1.10", expected: "https://quay.io"}, {image: "gcr.io/project-name/main:1.2.3", expected: "https://gcr.io"}, {image: "dtr.example.com/stackrox/main:1.2.3", expected: "https://dtr.example.com"}, {image: "docker-default.registry.svc:5000/stackrox/main:1.2", expected: "https://docker-default.registry.svc:5000"}, diff --git a/pkg/renderer/templates/public_values.yaml.tpl b/pkg/renderer/templates/public_values.yaml.tpl index 652fe440c02cc..d69b0f5e97298 100644 --- a/pkg/renderer/templates/public_values.yaml.tpl +++ b/pkg/renderer/templates/public_values.yaml.tpl @@ -65,7 +65,7 @@ central: {{- if .K8sConfig.ImageOverrides.Main.Tag }} # WARNING: You are using a non-default main image tag. Upgrades via 'helm upgrade' # will not work as expected. To ensure a smooth upgrade experience, make sure - # StackRox images are mirrored with the same tags as in the stackrox.io registry. + # StackRox images are mirrored with the same tags as in the quay.io/stackrox-io registry. tag: {{ .K8sConfig.ImageOverrides.Main.Tag }} {{- end }} {{- end }} @@ -108,7 +108,7 @@ central: {{- if .K8sConfig.ImageOverrides.CentralDB.Tag }} # WARNING: You are using a non-default Central DB image tag. Upgrades via # 'helm upgrade' will not work as expected. To ensure a smooth upgrade experience, - # make sure StackRox images are mirrored with the same tags as in the stackrox.io + # make sure StackRox images are mirrored with the same tags as in the quay.io/stackrox-io # registry. tag: {{ .K8sConfig.ImageOverrides.CentralDB.Tag }} {{- end }} @@ -143,7 +143,7 @@ scanner: {{- if .K8sConfig.ImageOverrides.Scanner.Tag }} # WARNING: You are using a non-default Scanner image tag. Upgrades via 'helm upgrade' # will not work as expected. To ensure a smooth upgrade experience, make sure - # StackRox images are mirrored with the same tags as in the stackrox.io registry. + # StackRox images are mirrored with the same tags as in the quay.io/stackrox-io registry. tag: {{ .K8sConfig.ImageOverrides.Scanner.Tag }} {{- end }} {{- end }} @@ -159,7 +159,7 @@ scanner: {{- if .K8sConfig.ImageOverrides.ScannerDB.Tag }} # WARNING: You are using a non-default Scanner DB image tag. Upgrades via # 'helm upgrade' will not work as expected. To ensure a smooth upgrade experience, - # make sure StackRox images are mirrored with the same tags as in the stackrox.io + # make sure StackRox images are mirrored with the same tags as in the quay.io/stackrox-io # registry. tag: {{ .K8sConfig.ImageOverrides.ScannerDB.Tag }} {{- end }} diff --git a/roxctl/central/generate/generate_test.go b/roxctl/central/generate/generate_test.go index ad76babde2674..113eeb41ebf14 100644 --- a/roxctl/central/generate/generate_test.go +++ b/roxctl/central/generate/generate_test.go @@ -48,7 +48,7 @@ func TestRestoreKeysAndCerts(t *testing.T) { flavorName := defaults.ImageFlavorNameDevelopmentBuild if buildinfo.ReleaseBuild { - flavorName = defaults.ImageFlavorNameStackRoxIORelease + flavorName = defaults.ImageFlavorNameOpenSource } config := renderer.Config{ Version: version.GetMainVersion(), @@ -129,7 +129,7 @@ func TestTelemetryConfiguration(t *testing.T) { flavorName := defaults.ImageFlavorNameDevelopmentBuild if buildinfo.ReleaseBuild { - flavorName = defaults.ImageFlavorNameStackRoxIORelease + flavorName = defaults.ImageFlavorNameOpenSource } config := renderer.Config{ Version: version.GetMainVersion(), @@ -215,7 +215,7 @@ func TestMonitoringConfiguration(t *testing.T) { flavorName := defaults.ImageFlavorNameDevelopmentBuild if buildinfo.ReleaseBuild { - flavorName = defaults.ImageFlavorNameStackRoxIORelease + flavorName = defaults.ImageFlavorNameOpenSource } config := renderer.Config{ K8sConfig: &renderer.K8sConfig{ diff --git a/roxctl/helm/output/output_lint_test.go b/roxctl/helm/output/output_lint_test.go index 7a6957892ac5c..928dbe80d4e5d 100644 --- a/roxctl/helm/output/output_lint_test.go +++ b/roxctl/helm/output/output_lint_test.go @@ -60,7 +60,6 @@ func (s *HelmChartTestSuite) TestOutputHelmChart() { // Group: Valid --image-defaults, no --rhacs {flavor: defaults.ImageFlavorNameDevelopmentBuild, rhacs: false}, - {flavor: defaults.ImageFlavorNameStackRoxIORelease, rhacs: false}, {flavor: defaults.ImageFlavorNameRHACSRelease, rhacs: false}, {flavor: defaults.ImageFlavorNameOpenSource, rhacs: false}, @@ -72,7 +71,6 @@ func (s *HelmChartTestSuite) TestOutputHelmChart() { {flavor: "", flavorProvided: true, rhacs: true, wantErr: true}, {flavor: "dummy", rhacs: true, wantErr: true}, {flavor: defaults.ImageFlavorNameDevelopmentBuild, rhacs: true, wantErr: true}, - {flavor: defaults.ImageFlavorNameStackRoxIORelease, rhacs: true, wantErr: true}, {flavor: defaults.ImageFlavorNameRHACSRelease, rhacs: true, wantErr: true}, {flavor: defaults.ImageFlavorNameOpenSource, rhacs: true, wantErr: true}, } @@ -102,7 +100,6 @@ func (s *HelmChartTestSuite) TestOutputHelmChart() { func (s *HelmChartTestSuite) TestHelmLint() { flavorsToTest := []string{ defaults.ImageFlavorNameDevelopmentBuild, - defaults.ImageFlavorNameStackRoxIORelease, defaults.ImageFlavorNameRHACSRelease, defaults.ImageFlavorNameOpenSource, } diff --git a/sensor/kubernetes/listener/resources/convert.go b/sensor/kubernetes/listener/resources/convert.go index 41bd1bc640ad3..2110e227cb2e9 100644 --- a/sensor/kubernetes/listener/resources/convert.go +++ b/sensor/kubernetes/listener/resources/convert.go @@ -337,7 +337,7 @@ func (w *deploymentWrap) populateImageMetadata(localImages set.StringSet, pods . image := w.Deployment.Containers[i].Image // If there already is an image ID for the image then that implies that the name of the image was fully qualified - // with an image digest. e.g. stackrox.io/main@sha256:xyz + // with an image digest. e.g. quay.io/stackrox-io/main@sha256:xyz // If the ID already exists, populate NotPullable and IsClusterLocal. if image.GetId() != "" { // Use the image ID from the pod's ContainerStatus. diff --git a/tests/roxctl/bats-tests/cluster/sensor-generate-image-overrides.bats b/tests/roxctl/bats-tests/cluster/sensor-generate-image-overrides.bats index 253a4663db610..273f5c35ac21c 100755 --- a/tests/roxctl/bats-tests/cluster/sensor-generate-image-overrides.bats +++ b/tests/roxctl/bats-tests/cluster/sensor-generate-image-overrides.bats @@ -25,10 +25,10 @@ teardown() { registry_from_flavor() { case "$central_flavor" in "development_build") - echo "docker\.io/stackrox" + echo "quay.io/rhacs-eng" ;; - "stackrox.io") - echo "stackrox\.io" + "opensource") + echo "quay.io/stackrox-io" ;; esac } @@ -38,7 +38,7 @@ collector_full_from_flavor() { "development_build") echo "collector:$any_version_latest" ;; - "stackrox.io") + "opensource") echo "collector:$any_version" ;; esac @@ -49,7 +49,7 @@ collector_slim_from_flavor() { "development_build") echo "collector:$any_version_slim" ;; - "stackrox.io") + "opensource") echo "collector-slim:$any_version" ;; esac diff --git a/tests/roxctl/bats-tests/helpers.bash b/tests/roxctl/bats-tests/helpers.bash index aeae969a239c0..99dae3b93f4fc 100644 --- a/tests/roxctl/bats-tests/helpers.bash +++ b/tests/roxctl/bats-tests/helpers.bash @@ -251,13 +251,6 @@ image_reference_regex() { quay.io/stackrox-io) echo "quay\.io/stackrox-io/$component:$version" ;; - stackrox.io) - if [[ "$component" == "collector" ]]; then - echo "collector.stackrox\.io/$component:$version" - else - echo "stackrox\.io/$component:$version" - fi - ;; registry.redhat.io) echo "registry\.redhat\.io/advanced-cluster-security/rhacs-$component-rhel8:$version" ;; diff --git a/tests/roxctl/bats-tests/local/central-generate-development.bats b/tests/roxctl/bats-tests/local/central-generate-development.bats index e61fc8a0c74de..876b057b31ec4 100755 --- a/tests/roxctl/bats-tests/local/central-generate-development.bats +++ b/tests/roxctl/bats-tests/local/central-generate-development.bats @@ -50,18 +50,18 @@ teardown() { @test "roxctl-development central generate k8s should work when main is from custom registry and --image-defaults are used" { run_image_defaults_registry_test roxctl-development k8s \ 'example.com' \ - 'stackrox.io' \ + 'quay.io/stackrox-io' \ '--main-image' 'example.com/main:1.2.3' \ '--central-db-image' 'example.com/central-db:1.2.3' \ - '--image-defaults' 'stackrox.io' + '--image-defaults' 'opensource' } @test "roxctl-development roxctl central generate k8s should not support --rhacs flag" { run_no_rhacs_flag_test roxctl-development k8s } -@test "roxctl-development roxctl central generate k8s --image-defaults=stackrox.io should use stackrox.io registry" { - run_image_defaults_registry_test roxctl-development k8s 'stackrox.io' 'stackrox.io' '--image-defaults' 'stackrox.io' +@test "roxctl-development roxctl central generate k8s --image-defaults=opensource should use quay.io/stackrox-io registry" { + run_image_defaults_registry_test roxctl-development k8s 'quay.io/stackrox-io' 'quay.io/stackrox-io' '--image-defaults' 'opensource' } @test "roxctl-development roxctl central generate k8s --image-defaults=rhacs should use registry.redhat.io registry" { @@ -72,10 +72,6 @@ teardown() { run_image_defaults_registry_test roxctl-development k8s 'quay.io/rhacs-eng' 'quay.io/rhacs-eng' '--image-defaults' 'development_build' } -@test "roxctl-development roxctl central generate k8s --image-defaults=opensource should use quay.io/stackrox-io registry" { - run_image_defaults_registry_test roxctl-development k8s 'quay.io/stackrox-io' 'quay.io/stackrox-io' '--image-defaults' 'opensource' -} - # DEV / OPENSHIFT @test "roxctl-development central generate openshift should use quay.io/rhacs-eng registry" { @@ -105,18 +101,18 @@ teardown() { @test "roxctl-development central generate openshift should work when main is from custom registry and --image-defaults are used" { run_image_defaults_registry_test roxctl-development openshift \ 'example.com' \ - 'stackrox.io' \ + 'quay.io/stackrox-io' \ '--main-image' 'example.com/main:1.2.3' \ '--central-db-image' 'example.com/central-db:1.2.3' \ - '--image-defaults' 'stackrox.io' + '--image-defaults' 'opensource' } @test "roxctl-development roxctl central generate openshift should not support --rhacs flag" { run_no_rhacs_flag_test roxctl-development openshift } -@test "roxctl-development roxctl central generate openshift --image-defaults=stackrox.io should use stackrox.io registry" { - run_image_defaults_registry_test roxctl-development openshift 'stackrox.io' 'stackrox.io' '--image-defaults' 'stackrox.io' +@test "roxctl-development roxctl central generate openshift --image-defaults=opensource should use quay.io/stackrox-io registry" { + run_image_defaults_registry_test roxctl-development openshift 'quay.io/stackrox-io' 'quay.io/stackrox-io' '--image-defaults' 'opensource' } @test "roxctl-development roxctl central generate openshift --image-defaults=rhacs should use registry.redhat.io registry" { @@ -127,10 +123,6 @@ teardown() { run_image_defaults_registry_test roxctl-development openshift 'quay.io/rhacs-eng' 'quay.io/rhacs-eng' '--image-defaults' 'development_build' } -@test "roxctl-development roxctl central generate openshift --image-defaults=opensource should use quay.io/stackrox-io registry" { - run_image_defaults_registry_test roxctl-development openshift 'quay.io/stackrox-io' 'quay.io/stackrox-io' '--image-defaults' 'opensource' -} - @test "roxctl-development central generate k8s --debug should use the local directory" { run_with_debug_flag_test roxctl-development central generate k8s none --output-dir "$out_dir" assert_success diff --git a/tests/roxctl/bats-tests/local/central-generate-interactive-flavors.bats b/tests/roxctl/bats-tests/local/central-generate-interactive-flavors.bats index 17d5bfbfd411d..6466108ac6b31 100755 --- a/tests/roxctl/bats-tests/local/central-generate-interactive-flavors.bats +++ b/tests/roxctl/bats-tests/local/central-generate-interactive-flavors.bats @@ -43,7 +43,7 @@ bitfield_to_failure() { } assert_flavor_prompt_development() { - assert_line --partial 'Default container images settings (development_build, stackrox.io, rhacs, opensource); it controls repositories from where to download the images, image names and tags format (default: "development_build"):' + assert_line --partial 'Default container images settings (development_build, rhacs, opensource); it controls repositories from where to download the images, image names and tags format (default: "development_build"):' } assert_flavor_prompt_release() { @@ -58,10 +58,10 @@ assert_prompts_development() { assert_line --regexp '^Scanner .* "quay.io/rhacs-eng/scanner:' } -assert_prompts_stackrox() { - assert_line --regexp '^Main .* "stackrox.io/main:' - assert_line --regexp '^Scanner-db .* "stackrox.io/scanner-db:' - assert_line --regexp '^Scanner .* "stackrox.io/scanner:' +assert_prompts_opensource() { + assert_line --regexp '^Main .* "quay.io/stackrox-io/main:' + assert_line --regexp '^Scanner-db .* "quay.io/stackrox-io/scanner-db:' + assert_line --regexp '^Scanner .* "quay.io/stackrox-io/scanner:' } assert_prompts_rhacs() { @@ -88,16 +88,16 @@ assert_prompts_rhacs() { assert_components_registry "$out_dir/scanner" "quay.io/rhacs-eng" "$any_version" 'scanner' 'scanner-db' } -@test "roxctl-development central generate interactive flavor=stackrox.io" { +@test "roxctl-development central generate interactive flavor=opensource" { roxctl_bin="$(roxctl-development-cmd)" - run expect -f "tests/roxctl/bats-tests/local/expect/flavor-interactive.expect.tcl" -- "$roxctl_bin" stackrox.io "$out_dir" "stackrox.io" + run expect -f "tests/roxctl/bats-tests/local/expect/flavor-interactive.expect.tcl" -- "$roxctl_bin" opensource "$out_dir" "quay.io/stackrox-io" bitfield_to_failure "$status" assert_success - assert_prompts_stackrox + assert_prompts_opensource assert_flavor_prompt_development sleep 2 # due to frequent flakes of missing yaml files - assert_components_registry "$out_dir/central" "stackrox.io" "$any_version" 'main' - assert_components_registry "$out_dir/scanner" "stackrox.io" "$any_version" 'scanner' 'scanner-db' + assert_components_registry "$out_dir/central" "quay.io/stackrox-io" "$any_version" 'main' + assert_components_registry "$out_dir/scanner" "quay.io/stackrox-io" "$any_version" 'scanner' 'scanner-db' } @test "roxctl-development central generate interactive flavor=rhacs" { @@ -120,16 +120,16 @@ assert_prompts_rhacs() { assert_success } -@test "roxctl-release central generate interactive flavor=stackrox.io" { +@test "roxctl-release central generate interactive flavor=opensource" { roxctl_bin="$(roxctl-release-cmd)" - run expect -f "tests/roxctl/bats-tests/local/expect/flavor-interactive.expect.tcl" -- "$roxctl_bin" stackrox.io "$out_dir" "stackrox.io" + run expect -f "tests/roxctl/bats-tests/local/expect/flavor-interactive.expect.tcl" -- "$roxctl_bin" opensource "$out_dir" "quay.io/stackrox-io" bitfield_to_failure "$status" assert_success - assert_prompts_stackrox + assert_prompts_opensource assert_flavor_prompt_release sleep 2 # due to frequent flakes of missing yaml files - assert_components_registry "$out_dir/central" "stackrox.io" "$any_version" 'main' - assert_components_registry "$out_dir/scanner" "stackrox.io" "$any_version" 'scanner' 'scanner-db' + assert_components_registry "$out_dir/central" "quay.io/stackrox-io" "$any_version" 'main' + assert_components_registry "$out_dir/scanner" "quay.io/stackrox-io" "$any_version" 'scanner' 'scanner-db' } @test "roxctl-release central generate interactive flavor=rhacs" { diff --git a/tests/roxctl/bats-tests/local/central-generate-release.bats b/tests/roxctl/bats-tests/local/central-generate-release.bats index 0b281f158fbdc..fe103a6a6139a 100755 --- a/tests/roxctl/bats-tests/local/central-generate-release.bats +++ b/tests/roxctl/bats-tests/local/central-generate-release.bats @@ -49,18 +49,18 @@ teardown() { @test "roxctl-release central generate k8s should work when main is from custom registry and --image-defaults are used" { run_image_defaults_registry_test roxctl-release k8s \ 'example.com' \ - 'stackrox.io' \ + 'quay.io/stackrox-io' \ '--main-image' 'example.com/main:1.2.3' \ '--central-db-image' 'example.com/central-db:1.2.3'\ - '--image-defaults' 'stackrox.io' + '--image-defaults' 'opensource' } @test "roxctl-release roxctl central generate k8s should not support --rhacs flag" { run_no_rhacs_flag_test roxctl-release k8s } -@test "roxctl-release roxctl central generate k8s --image-defaults=stackrox.io should use stackrox.io registry" { - run_image_defaults_registry_test roxctl-release k8s 'stackrox.io' 'stackrox.io' '--image-defaults' 'stackrox.io' +@test "roxctl-release roxctl central generate k8s --image-defaults=opensource should use quay.io/stackrox-io registry" { + run_image_defaults_registry_test roxctl-release k8s 'quay.io/stackrox-io' 'quay.io/stackrox-io' '--image-defaults' 'opensource' } @test "roxctl-release roxctl central generate k8s --image-defaults=rhacs should use registry.redhat.io registry" { @@ -71,10 +71,6 @@ teardown() { run_image_defaults_registry_test roxctl-release k8s 'quay.io/rhacs-eng' 'quay.io/rhacs-eng' '--image-defaults' 'development_build' } -@test "roxctl-release roxctl central generate k8s --image-defaults=opensource should use quay.io/stackrox-io registry" { - run_image_defaults_registry_test roxctl-release k8s 'quay.io/stackrox-io' 'quay.io/stackrox-io' '--image-defaults' 'opensource' -} - # RELEASE / OPENSHIFT @test "roxctl-release central generate openshift should use registry.redhat.io registry" { @@ -104,18 +100,18 @@ teardown() { @test "roxctl-release central generate openshift should work when main is from custom registry and --image-defaults are used" { run_image_defaults_registry_test roxctl-release openshift \ 'example.com' \ - 'stackrox.io' \ + 'quay.io/stackrox-io' \ '--main-image' 'example.com/main:1.2.3' \ '--central-db-image' 'example.com/central-db:1.2.3' \ - '--image-defaults' 'stackrox.io' + '--image-defaults' 'opensource' } @test "roxctl-release roxctl central generate openshift should not support --rhacs flag" { run_no_rhacs_flag_test roxctl-release openshift } -@test "roxctl-release roxctl central generate openshift --image-defaults=stackrox.io should use stackrox.io registry" { - run_image_defaults_registry_test roxctl-release openshift 'stackrox.io' 'stackrox.io' '--image-defaults' 'stackrox.io' +@test "roxctl-release roxctl central generate openshift --image-defaults=opensource should use quay.io/stackrox-io registry" { + run_image_defaults_registry_test roxctl-release openshift 'quay.io/stackrox-io' 'quay.io/stackrox-io' '--image-defaults' 'opensource' } @test "roxctl-release roxctl central generate openshift --image-defaults=rhacs should use registry.redhat.io registry" { @@ -126,10 +122,6 @@ teardown() { run_image_defaults_registry_test roxctl-release openshift 'quay.io/rhacs-eng' 'quay.io/rhacs-eng' '--image-defaults' 'development_build' } -@test "roxctl-release roxctl central generate openshift --image-defaults=opensource should use quay.io/stackrox-io registry" { - run_image_defaults_registry_test roxctl-release openshift 'quay.io/stackrox-io' 'quay.io/stackrox-io' '--image-defaults' 'opensource' -} - @test "roxctl-release central generate k8s --debug should fail" { run roxctl-release central generate k8s none --output-dir "$out_dir" --debug assert_failure diff --git a/tests/roxctl/bats-tests/local/expect/flavor-interactive.expect.tcl b/tests/roxctl/bats-tests/local/expect/flavor-interactive.expect.tcl index fffb566cc8e1d..a951d452ae9ea 100755 --- a/tests/roxctl/bats-tests/local/expect/flavor-interactive.expect.tcl +++ b/tests/roxctl/bats-tests/local/expect/flavor-interactive.expect.tcl @@ -45,7 +45,7 @@ expect "The directory to output the deployment bundle to*:*: " { send "$out_dir\ expect "Whether to enable telemetry*:" { send "\n" } # Central-db image to use (default: "docker.io/stackrox/central-db:2.21.0-15-g448f2dc8fa"): -# Central-db image to use (default: "stackrox.io/central-db:3.67.x-296-g56df6a892d"): +# Central-db image to use (default: "quay.io/stackrox-io/central-db:3.67.x-296-g56df6a892d"): # Central-db image to use (default: "registry.redhat.io/advanced-cluster-security/rhacs-central-db-rhel8:3.68.x-30-g516b4e7a6c-dirty"): expect { default { @@ -72,7 +72,7 @@ expect "List of secrets to add as declarative configuration*:" { send "\n" } expect "The method of exposing Central*:*: " { send "none\n" } # Main image to use (default: "docker.io/stackrox/main:3.67.x-296-g56df6a892d"): -# Main image to use (default: "stackrox.io/main:3.67.x-296-g56df6a892d") +# Main image to use (default: "quay.io/stackrox-io/main:3.67.x-296-g56df6a892d") # Main image to use (default: "registry.redhat.io/advanced-cluster-security/rhacs-main-rhel8:3.68.x-30-g516b4e7a6c-dirty"): expect { default { @@ -100,7 +100,7 @@ expect "The deployment tool to use (kubectl, helm, helm-values)*:" { send "\n" } expect "Istio version when deploying into an Istio-enabled cluster*:" { send "\n" } # Scanner-db image to use (default: "docker.io/stackrox/scanner-db:2.21.0-15-g448f2dc8fa"): -# Scanner-db image to use (default: "stackrox.io/scanner-db:3.67.x-296-g56df6a892d"): +# Scanner-db image to use (default: "quay.io/stackrox-io/scanner-db:3.67.x-296-g56df6a892d"): # Scanner-db image to use (default: "registry.redhat.io/advanced-cluster-security/rhacs-scanner-db-rhel8:3.68.x-30-g516b4e7a6c-dirty"): expect { default { @@ -123,7 +123,7 @@ expect { } } # Scanner image to use (default: "docker.io/stackrox/scanner:2.21.0-15-g448f2dc8fa"): -# Scanner image to use (default: "stackrox.io/scanner:3.67.x-296-g56df6a892d"): +# Scanner image to use (default: "quay.io/stackrox-io/scanner:3.67.x-296-g56df6a892d"): expect { default { send_user "\nFATAL: No question about scanner image\n" diff --git a/tests/roxctl/bats-tests/local/roxctl-helm-output-central-development.bats b/tests/roxctl/bats-tests/local/roxctl-helm-output-central-development.bats index ce59a44d8ea71..48936fd41bf20 100755 --- a/tests/roxctl/bats-tests/local/roxctl-helm-output-central-development.bats +++ b/tests/roxctl/bats-tests/local/roxctl-helm-output-central-development.bats @@ -28,14 +28,14 @@ teardown() { } @test "roxctl-development helm output should support --image-defaults flag" { - run roxctl-development helm output central-services --image-defaults="stackrox.io" --output-dir "$out_dir" + run roxctl-development helm output central-services --image-defaults="opensource" --output-dir "$out_dir" assert_success } @test "roxctl-development helm output help-text should state default value for --image-defaults flag" { run roxctl-development helm output central-services -h assert_success - assert_line --regexp "--image-defaults.*\(development_build, stackrox.io, rhacs, opensource\).*default \"development_build\"" + assert_line --regexp "--image-defaults.*\(development_build, rhacs, opensource\).*default \"development_build\"" } @test "roxctl-development helm output central-services should use quay.io/rhacs-eng registry by default" { @@ -56,14 +56,7 @@ teardown() { @test "roxctl-development helm output central-services --image-defaults=dummy should fail" { run roxctl-development helm output central-services --image-defaults=dummy --output-dir "$out_dir" assert_failure - assert_line --regexp "ERROR:[[:space:]]+unable to get chart meta values: '--image-defaults': unexpected value 'dummy', allowed values are \[development_build stackrox.io rhacs opensource\]" -} - -@test "roxctl-development helm output central-services --image-defaults=stackrox.io should use stackrox.io registry" { - run roxctl-development helm output central-services --image-defaults=stackrox.io --output-dir "$out_dir" - assert_success - assert_output --partial "Written Helm chart central-services to directory" - assert_helm_template_central_registry "$out_dir" 'stackrox.io' "$any_version" 'main' 'scanner' 'scanner-db' + assert_line --regexp "ERROR:[[:space:]]+unable to get chart meta values: '--image-defaults': unexpected value 'dummy', allowed values are \[development_build rhacs opensource\]" } @test "roxctl-development helm output central-services --image-defaults=rhacs should use registry.redhat.io registry" { @@ -94,8 +87,8 @@ teardown() { has_flag_collision_warning } -@test "roxctl-development helm output central-services --rhacs --image-defaults=stackrox.io should return error about --rhacs colliding with --image-defaults" { - run roxctl-development helm output central-services --rhacs --image-defaults=stackrox.io --output-dir "$out_dir" +@test "roxctl-development helm output central-services --rhacs --image-defaults=opensource should return error about --rhacs colliding with --image-defaults" { + run roxctl-development helm output central-services --rhacs --image-defaults=opensource --output-dir "$out_dir" assert_failure has_deprecation_warning has_flag_collision_warning diff --git a/tests/roxctl/bats-tests/local/roxctl-helm-output-central-release.bats b/tests/roxctl/bats-tests/local/roxctl-helm-output-central-release.bats index 26eda7b11e9b2..e85fee06dde70 100755 --- a/tests/roxctl/bats-tests/local/roxctl-helm-output-central-release.bats +++ b/tests/roxctl/bats-tests/local/roxctl-helm-output-central-release.bats @@ -41,13 +41,6 @@ teardown() { assert_helm_template_central_registry "$out_dir" 'registry.redhat.io' "$any_version" 'main' 'scanner' 'scanner-db' } -@test "roxctl-release helm output central-services --image-defaults=stackrox.io should use stackrox.io registry" { - run roxctl-release helm output central-services --image-defaults=stackrox.io --output-dir "$out_dir" - assert_success - assert_output --partial "Written Helm chart central-services to directory" - assert_helm_template_central_registry "$out_dir" 'stackrox.io' "$any_version" 'main' 'scanner' 'scanner-db' -} - @test "roxctl-release helm output central-services --image-defaults=rhacs should use registry.redhat.io registry" { run roxctl-release helm output central-services --image-defaults=rhacs --output-dir "$out_dir" assert_success @@ -75,8 +68,8 @@ teardown() { assert_line --regexp "ERROR:[[:space:]]+unable to get chart meta values: '--image-defaults': unexpected value '', allowed values are \[rhacs opensource\]" } -@test "roxctl-release helm output central-services --rhacs --image-defaults=stackrox.io should return error about --rhacs colliding with --image-defaults" { - run roxctl-release helm output central-services --rhacs --image-defaults=stackrox.io --output-dir "$out_dir" +@test "roxctl-release helm output central-services --rhacs --image-defaults=opensource should return error about --rhacs colliding with --image-defaults" { + run roxctl-release helm output central-services --rhacs --image-defaults=opensource --output-dir "$out_dir" assert_failure has_deprecation_warning has_flag_collision_warning diff --git a/tests/roxctl/bats-tests/local/roxctl-helm-output-secured-cluster-services-development.bats b/tests/roxctl/bats-tests/local/roxctl-helm-output-secured-cluster-services-development.bats index 935b04a1e244d..fa9d675111d38 100755 --- a/tests/roxctl/bats-tests/local/roxctl-helm-output-secured-cluster-services-development.bats +++ b/tests/roxctl/bats-tests/local/roxctl-helm-output-secured-cluster-services-development.bats @@ -48,21 +48,6 @@ teardown() { assert_components_registry "$out_dir/rendered" "quay.io/rhacs-eng" "$any_version" 'collector' 'admission-controller' 'sensor' } -@test "roxctl-development helm output secured-cluster-services --image-defaults=stackrox.io should use stackrox.io registry" { - run roxctl-development helm output secured-cluster-services --image-defaults=stackrox.io --remove --output-dir "$out_dir" - assert_success - assert_output --partial "Written Helm chart secured-cluster-services to directory" - - helm_template_secured_cluster "$out_dir" "$out_dir/rendered" "$CLUSTER_NAME" - assert_components_registry "$out_dir/rendered" "stackrox.io" "$any_version" 'collector-slim' 'admission-controller' 'sensor' - - helm_template_secured_cluster "$out_dir" "$out_dir/rendered" "$CLUSTER_NAME" "--set" "collector.slimMode=false" - assert_components_registry "$out_dir/rendered" "stackrox.io" "$any_version" 'collector' 'admission-controller' 'sensor' - - helm_template_secured_cluster "$out_dir" "$out_dir/rendered" "$CLUSTER_NAME" "--set" "collector.slimMode=true" - assert_components_registry "$out_dir/rendered" "stackrox.io" "$any_version" 'collector-slim' 'admission-controller' 'sensor' -} - @test "roxctl-development helm output secured-cluster-services --image-defaults=rhacs should use registry.redhat.io registry (default collector)" { run roxctl-development helm output secured-cluster-services --image-defaults=rhacs --remove --output-dir "$out_dir" assert_success diff --git a/tests/roxctl/bats-tests/local/roxctl-helm-output-secured-cluster-services-release.bats b/tests/roxctl/bats-tests/local/roxctl-helm-output-secured-cluster-services-release.bats index 529bafd2dde18..56e9f14496bfa 100755 --- a/tests/roxctl/bats-tests/local/roxctl-helm-output-secured-cluster-services-release.bats +++ b/tests/roxctl/bats-tests/local/roxctl-helm-output-secured-cluster-services-release.bats @@ -47,21 +47,6 @@ teardown() { assert_components_registry "$out_dir/rendered" "registry.redhat.io" "$any_version" 'collector-slim' 'admission-controller' 'sensor' } -@test "roxctl-release helm output secured-cluster-services --image-defaults=stackrox.io should use stackrox.io registry" { - run roxctl-release helm output secured-cluster-services --image-defaults=stackrox.io --remove --output-dir "$out_dir" - assert_success - assert_output --partial "Written Helm chart secured-cluster-services to directory" - - helm_template_secured_cluster "$out_dir" "$out_dir/rendered" "$CLUSTER_NAME" - assert_components_registry "$out_dir/rendered" "stackrox.io" "$any_version" 'collector-slim' 'admission-controller' 'sensor' - - helm_template_secured_cluster "$out_dir" "$out_dir/rendered" "$CLUSTER_NAME" "--set" "collector.slimMode=false" - assert_components_registry "$out_dir/rendered" "stackrox.io" "$any_version" 'collector' 'admission-controller' 'sensor' - - helm_template_secured_cluster "$out_dir" "$out_dir/rendered" "$CLUSTER_NAME" "--set" "collector.slimMode=true" - assert_components_registry "$out_dir/rendered" "stackrox.io" "$any_version" 'collector-slim' 'admission-controller' 'sensor' -} - @test "roxctl-release helm output secured-cluster-services --image-defaults=rhacs should use registry.redhat.io registry" { run roxctl-release helm output secured-cluster-services --image-defaults=rhacs --remove --output-dir "$out_dir" assert_success diff --git a/ui/apps/platform/cypress/fixtures/clusters/certExpirationDegraded.json b/ui/apps/platform/cypress/fixtures/clusters/certExpirationDegraded.json index f50b1f39eede3..9c7b005ac3b23 100644 --- a/ui/apps/platform/cypress/fixtures/clusters/certExpirationDegraded.json +++ b/ui/apps/platform/cypress/fixtures/clusters/certExpirationDegraded.json @@ -349,4 +349,4 @@ } ], "clusterIdToRetentionInfo": {} -} \ No newline at end of file +}