diff --git a/dev/env/manifests/external-secrets/application/00-application.yaml b/dev/env/manifests/external-secrets/application/00-application.yaml index 931377fba7..90277c6cf4 100644 --- a/dev/env/manifests/external-secrets/application/00-application.yaml +++ b/dev/env/manifests/external-secrets/application/00-application.yaml @@ -28,16 +28,3 @@ spec: chart: external-secrets repoURL: https://charts.external-secrets.io targetRevision: "$EXTERNAL_SECRETS_VERSION" - helm: - valuesObject: - image: - repository: quay.io/app-sre/external-secrets - tag: "$EXTERNAL_SECRETS_VERSION" - webhook: - image: - repository: quay.io/app-sre/external-secrets - tag: "$EXTERNAL_SECRETS_VERSION" - certController: - image: - repository: quay.io/app-sre/external-secrets - tag: "$EXTERNAL_SECRETS_VERSION" diff --git a/e2e/e2e_canary_upgrade_test.go b/e2e/e2e_canary_upgrade_test.go index 103bc337b2..5755d9005f 100644 --- a/e2e/e2e_canary_upgrade_test.go +++ b/e2e/e2e_canary_upgrade_test.go @@ -397,7 +397,7 @@ func getDeploymentName(version string) string { func getOperatorDeployments(ctx context.Context) ([]appsv1.Deployment, error) { deployments := appsv1.DeploymentList{} - labels := map[string]string{"app": "rhacs-operator"} + labels := map[string]string{"app.kubernetes.io/name": "rhacs-operator"} err := k8sClient.List(ctx, &deployments, ctrlClient.InNamespace("rhacs"), ctrlClient.MatchingLabels(labels)) diff --git a/internal/central/pkg/handlers/central.go b/internal/central/pkg/handlers/central.go index 07dd2db344..edf1d6fcde 100644 --- a/internal/central/pkg/handlers/central.go +++ b/internal/central/pkg/handlers/central.go @@ -127,7 +127,7 @@ func (h centralHandler) List(w http.ResponseWriter, r *http.Request) { listArgs := coreServices.NewListArguments(r.URL.Query()) if err := listArgs.Validate(); err != nil { - return nil, errors.NewWithCause(errors.ErrorMalformedRequest, err, "Unable to list central requests: %s", err.Error()) + return nil, errors.NewWithCause(errors.ErrorMalformedRequest, err, "Invalid search or filter parameters: %s", err.Error()) } centralRequests, paging, err := h.service.List(ctx, listArgs) diff --git a/internal/central/pkg/handlers/validation.go b/internal/central/pkg/handlers/validation.go index 0e9de840ac..25d4b911a9 100644 --- a/internal/central/pkg/handlers/validation.go +++ b/internal/central/pkg/handlers/validation.go @@ -31,7 +31,7 @@ func ValidCentralClusterName(value *string, field string) handlers.Validate { return errors.MalformedCentralClusterName("%s is invalid: %v", field, errs) } if !ValidCentralClusterNameRegexp.MatchString(*value) { - return errors.MalformedCentralClusterName("%s does not match %s", field, ValidCentralClusterNameRegexp.String()) + return errors.MalformedCentralClusterName("%s must use lowercase letters, numbers, and hyphens only (max 32 characters)", field) } return nil } @@ -68,7 +68,7 @@ func ValidateCloudProvider(centralService *services.CentralService, centralReque // Validation for Cloud Provider provider, providerSupported := supportedProviders.GetByName(centralRequest.CloudProvider) if !providerSupported { - return errors.ProviderNotSupported("provider %s is not supported, supported providers are: %s", centralRequest.CloudProvider, supportedProviders) + return errors.ProviderNotSupported("Cloud provider '%s' is not supported. Available providers: %s", centralRequest.CloudProvider, supportedProviders) } // Set Cloud Region default if not received in the request @@ -80,14 +80,14 @@ func ValidateCloudProvider(centralService *services.CentralService, centralReque // Validation for Cloud Region regionSupported := provider.IsRegionSupported(centralRequest.Region) if !regionSupported { - return errors.RegionNotSupported("region %s is not supported for %s, supported regions are: %s", centralRequest.Region, centralRequest.CloudProvider, provider.Regions) + return errors.RegionNotSupported("Region '%s' is not supported for %s. Available regions: %s", centralRequest.Region, centralRequest.CloudProvider, provider.Regions) } // Validate Region/InstanceType instanceType := (*centralService).DetectInstanceType(centralRequest) region, _ := provider.Regions.GetByName(centralRequest.Region) if !region.IsInstanceTypeSupported(config.InstanceType(instanceType)) { - return errors.InstanceTypeNotSupported("instance type '%s' not supported for region '%s'", instanceType.String(), region.Name) + return errors.InstanceTypeNotSupported("Instance type '%s' is not supported in region '%s'", instanceType.String(), region.Name) } return nil } diff --git a/internal/central/pkg/handlers/validation_test.go b/internal/central/pkg/handlers/validation_test.go index 5dc7f8103e..51cf6b65b1 100644 --- a/internal/central/pkg/handlers/validation_test.go +++ b/internal/central/pkg/handlers/validation_test.go @@ -275,7 +275,7 @@ func Test_Validation_validateCloudProvider(t *testing.T) { }, want: result{ wantErr: true, - reason: "region us-east is not supported for aws, supported regions are: [us-east-1]", + reason: "Region 'us-east' is not supported for aws. Available regions: [us-east-1]", }, }, { @@ -308,7 +308,7 @@ func Test_Validation_validateCloudProvider(t *testing.T) { }, want: result{ wantErr: true, - reason: "instance type 'eval' not supported for region 'us-east'", + reason: "Instance type 'eval' is not supported in region 'us-east'", }, }, }