clair: Add clair advanced configuration and allow for unmanaged clair…

… database (PROJQUAY-1696) - WIP - Users can specify a in the which will be consumed by Clair - Add a clairpostgres component
quay · Feb 17, 2022 · 5beecdc · 5beecdc
1 parent 0eee448
commit 5beecdc
Show file tree

Hide file tree

Showing 31 changed files with 1,015 additions and 308 deletions.
diff --git a/apis/quay/v1/quayregistry_types.go b/apis/quay/v1/quayregistry_types.go
@@ -41,6 +41,7 @@ const (
 	ComponentBase          ComponentKind = "base"
 	ComponentPostgres      ComponentKind = "postgres"
 	ComponentClair         ComponentKind = "clair"
+	ComponentClairPostgres ComponentKind = "clairpostgres"
 	ComponentRedis         ComponentKind = "redis"
 	ComponentHPA           ComponentKind = "horizontalpodautoscaler"
 	ComponentObjectStorage ComponentKind = "objectstorage"
@@ -60,6 +61,7 @@ var allComponents = []ComponentKind{
 	ComponentMirror,
 	ComponentMonitoring,
 	ComponentTLS,
+	ComponentClairPostgres,
 }
 
 var requiredComponents = []ComponentKind{
@@ -116,6 +118,7 @@ const (
 	ComponentBaseReady          ConditionType = "ComponentBaseReady"
 	ComponentPostgresReady      ConditionType = "ComponentPostgresReady"
 	ComponentClairReady         ConditionType = "ComponentClairReady"
+	ComponentClairPostgresReady ConditionType = "ComponentClairPostgresReady"
 	ComponentRedisReady         ConditionType = "ComponentRedisReady"
 	ComponentHPAReady           ConditionType = "ComponentHPAReady"
 	ComponentObjectStorageReady ConditionType = "ComponentObjectStorageReady"
@@ -542,6 +545,8 @@ func FieldGroupNameFor(cmp ComponentKind) (string, error) {
 		return "SecurityScanner", nil
 	case ComponentPostgres:
 		return "Database", nil
+	case ComponentClairPostgres:
+		return "", nil
 	case ComponentRedis:
 		return "Redis", nil
 	case ComponentObjectStorage:

diff --git a/apis/quay/v1/quayregistry_types_test.go b/apis/quay/v1/quayregistry_types_test.go
@@ -26,6 +26,7 @@ var ensureDefaultComponentsTests = []struct {
 					{Kind: "postgres", Managed: true},
 					{Kind: "redis", Managed: true},
 					{Kind: "clair", Managed: true},
+					{Kind: "clairpostgres", Managed: true},
 					{Kind: "objectstorage", Managed: true},
 					{Kind: "route", Managed: true},
 					{Kind: "tls", Managed: true},
@@ -44,6 +45,7 @@ var ensureDefaultComponentsTests = []struct {
 			{Kind: "postgres", Managed: true},
 			{Kind: "redis", Managed: true},
 			{Kind: "clair", Managed: true},
+			{Kind: "clairpostgres", Managed: true},
 			{Kind: "objectstorage", Managed: true},
 			{Kind: "route", Managed: true},
 			{Kind: "tls", Managed: true},
@@ -61,6 +63,7 @@ var ensureDefaultComponentsTests = []struct {
 					{Kind: "postgres", Managed: true},
 					{Kind: "redis", Managed: true},
 					{Kind: "clair", Managed: true},
+					{Kind: "clairpostgres", Managed: true},
 					{Kind: "objectstorage", Managed: true},
 					{Kind: "route", Managed: true},
 					{Kind: "tls", Managed: true},
@@ -74,6 +77,7 @@ var ensureDefaultComponentsTests = []struct {
 			{Kind: "postgres", Managed: true},
 			{Kind: "redis", Managed: true},
 			{Kind: "clair", Managed: true},
+			{Kind: "clairpostgres", Managed: true},
 			{Kind: "objectstorage", Managed: true},
 			{Kind: "route", Managed: true},
 			{Kind: "tls", Managed: true},
@@ -90,6 +94,7 @@ var ensureDefaultComponentsTests = []struct {
 					{Kind: "postgres", Managed: true},
 					{Kind: "redis", Managed: true},
 					{Kind: "clair", Managed: true},
+					{Kind: "clairpostgres", Managed: true},
 					{Kind: "objectstorage", Managed: true},
 					{Kind: "route", Managed: true},
 					{Kind: "tls", Managed: true},
@@ -108,6 +113,7 @@ var ensureDefaultComponentsTests = []struct {
 			{Kind: "postgres", Managed: true},
 			{Kind: "redis", Managed: true},
 			{Kind: "clair", Managed: true},
+			{Kind: "clairpostgres", Managed: true},
 			{Kind: "objectstorage", Managed: true},
 			{Kind: "route", Managed: true},
 			{Kind: "tls", Managed: true},
@@ -125,6 +131,7 @@ var ensureDefaultComponentsTests = []struct {
 					{Kind: "postgres", Managed: true},
 					{Kind: "redis", Managed: true},
 					{Kind: "clair", Managed: true},
+					{Kind: "clairpostgres", Managed: true},
 					{Kind: "objectstorage", Managed: true},
 					{Kind: "route", Managed: false},
 					{Kind: "tls", Managed: true},
@@ -143,6 +150,7 @@ var ensureDefaultComponentsTests = []struct {
 			{Kind: "postgres", Managed: true},
 			{Kind: "redis", Managed: true},
 			{Kind: "clair", Managed: true},
+			{Kind: "clairpostgres", Managed: true},
 			{Kind: "objectstorage", Managed: true},
 			{Kind: "route", Managed: false},
 			{Kind: "tls", Managed: true},
@@ -162,6 +170,7 @@ var ensureDefaultComponentsTests = []struct {
 			{Kind: "postgres", Managed: true},
 			{Kind: "redis", Managed: true},
 			{Kind: "clair", Managed: true},
+			{Kind: "clairpostgres", Managed: true},
 			{Kind: "objectstorage", Managed: false},
 			{Kind: "route", Managed: false},
 			{Kind: "tls", Managed: false},
@@ -185,6 +194,7 @@ var ensureDefaultComponentsTests = []struct {
 			{Kind: "postgres", Managed: true},
 			{Kind: "redis", Managed: true},
 			{Kind: "clair", Managed: true},
+			{Kind: "clairpostgres", Managed: true},
 			{Kind: "objectstorage", Managed: false},
 			{Kind: "route", Managed: true},
 			{Kind: "tls", Managed: true},
@@ -210,6 +220,7 @@ var ensureDefaultComponentsTests = []struct {
 			{Kind: "postgres", Managed: false},
 			{Kind: "redis", Managed: true},
 			{Kind: "clair", Managed: true},
+			{Kind: "clairpostgres", Managed: true},
 			{Kind: "objectstorage", Managed: false},
 			{Kind: "route", Managed: false},
 			{Kind: "tls", Managed: false},
@@ -239,6 +250,7 @@ var ensureDefaultComponentsTests = []struct {
 			{Kind: "postgres", Managed: false},
 			{Kind: "redis", Managed: true},
 			{Kind: "clair", Managed: true},
+			{Kind: "clairpostgres", Managed: true},
 			{Kind: "objectstorage", Managed: false},
 			{Kind: "route", Managed: false},
 			{Kind: "tls", Managed: true},
@@ -270,6 +282,7 @@ var ensureDefaultComponentsTests = []struct {
 			{Kind: "postgres", Managed: false},
 			{Kind: "redis", Managed: true},
 			{Kind: "clair", Managed: true},
+			{Kind: "clairpostgres", Managed: true},
 			{Kind: "objectstorage", Managed: false},
 			{Kind: "route", Managed: false},
 			{Kind: "tls", Managed: false},

diff --git a/apis/quay/v1/zz_generated.deepcopy.go b/apis/quay/v1/zz_generated.deepcopy.go
diff --git a/apis/redhatcop/v1alpha1/zz_generated.deepcopy.go b/apis/redhatcop/v1alpha1/zz_generated.deepcopy.go