diff --git a/apis/quay/v1/quayregistry_types.go b/apis/quay/v1/quayregistry_types.go index 75223f4bf..74ffb4b04 100644 --- a/apis/quay/v1/quayregistry_types.go +++ b/apis/quay/v1/quayregistry_types.go @@ -45,7 +45,7 @@ type ComponentKind string // Follow a list of constants representing all supported components. const ( ComponentQuay ComponentKind = "quay" - ComponentPostgres ComponentKind = "postgres" + ComponentPostgres ComponentKind = "postgres" ComponentClair ComponentKind = "clair" ComponentClairPostgres ComponentKind = "clairpostgres" ComponentRedis ComponentKind = "redis" @@ -170,7 +170,7 @@ const ( ConditionTypeRolloutBlocked ConditionType = "RolloutBlocked" ConditionComponentsCreated ConditionType = "ComponentsCreated" ComponentQuayReady ConditionType = "ComponentQuayReady" - ComponentPostgresReady ConditionType = "ComponentPostgresReady" + ComponentPostgresReady ConditionType = "ComponentPostgresReady" ComponentClairReady ConditionType = "ComponentClairReady" ComponentClairPostgresReady ConditionType = "ComponentClairPostgresReady" ComponentRedisReady ConditionType = "ComponentRedisReady" diff --git a/controllers/quay/features.go b/controllers/quay/features.go index 68f26f1e7..14da7383d 100644 --- a/controllers/quay/features.go +++ b/controllers/quay/features.go @@ -414,7 +414,7 @@ func (r *QuayRegistryReconciler) checkNeedsPostgresUpgradeForComponent( upgradeField *bool }{ v1.ComponentClairPostgres: {"clair-postgres", &qctx.NeedsClairPgUpgrade}, - v1.ComponentPostgres: {"quay-database", &qctx.NeedsPgUpgrade}, + v1.ComponentPostgres: {"quay-database", &qctx.NeedsPgUpgrade}, } info, ok := componentInfo[component] diff --git a/pkg/kustomize/kustomize.go b/pkg/kustomize/kustomize.go index 0c9d25628..10e361569 100644 --- a/pkg/kustomize/kustomize.go +++ b/pkg/kustomize/kustomize.go @@ -55,14 +55,14 @@ func ComponentImageFor(component v1.ComponentKind) (types.Image, error) { v1.ComponentQuay: componentImagePrefix + "QUAY", v1.ComponentClair: componentImagePrefix + "CLAIR", v1.ComponentRedis: componentImagePrefix + "REDIS", - v1.ComponentPostgres: componentImagePrefix + "QUAY_POSTGRES", + v1.ComponentPostgres: componentImagePrefix + "QUAY_POSTGRES", v1.ComponentClairPostgres: componentImagePrefix + "CLAIR_POSTGRES", } defaultImagesFor := map[v1.ComponentKind]string{ v1.ComponentQuay: "quay.io/projectquay/quay", v1.ComponentClair: "quay.io/projectquay/clair", v1.ComponentRedis: "docker.io/library/redis", - v1.ComponentPostgres: "quay.io/sclorg/postgresql-13-c9s", + v1.ComponentPostgres: "quay.io/sclorg/postgresql-13-c9s", v1.ComponentClairPostgres: "quay.io/sclorg/postgresql-15-c9s", }