Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions dev/env/manifests/external-secrets/application/00-application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion e2e/e2e_canary_upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion internal/central/pkg/handlers/central.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions internal/central/pkg/handlers/validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand All @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions internal/central/pkg/handlers/validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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]",
},
},
{
Expand Down Expand Up @@ -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'",
},
},
}
Expand Down
Loading