Merge pull request #445 from RedHatInsights/psav/metadata_fix

Fix genconfig schema for metadata
RedHatInsights · Sep 16, 2021 · bf4c777 · bf4c777
2 parents ca95a5a + 0e525a6
commit bf4c777
Show file tree

Hide file tree

Showing 3 changed files with 392 additions and 337 deletions.
diff --git a/controllers/cloud.redhat.com/clowdapp_controller.go b/controllers/cloud.redhat.com/clowdapp_controller.go
@@ -462,7 +462,7 @@ func updateMetadata(app *crd.ClowdApp, appConfig *config.AppConfig) {
 		metadata.Deployments = append(metadata.Deployments, deploymentMetadata)
 	}
 
-	appConfig.Metadata = metadata
+	appConfig.Metadata = &metadata
 }
 
 func (r *ClowdAppReconciler) runProviders(log logr.Logger, provider *providers.Provider, a *crd.ClowdApp) error {

diff --git a/controllers/cloud.redhat.com/config/schema.json b/controllers/cloud.redhat.com/config/schema.json
@@ -31,6 +31,9 @@
                 "logging": {
                     "$ref": "#/definitions/LoggingConfig"
                 },
+                "metadata": {
+                    "$ref": "#/definitions/AppMetadata"
+                },
                 "kafka": {
                     "$ref": "#/definitions/KafkaConfig"
                 },
@@ -85,6 +88,39 @@
                 "type"
             ]
         },
+        "AppMetadata": {
+            "title": "AppMetadata",
+            "type": "object",
+            "description": "Arbitrary metadata pertaining to the application application",
+            "properties": {
+                "deployments": {
+                    "description": "Metadata pertaining to an application's deployments",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/DeploymentMetadata"
+                    }
+                }
+            }
+        },
+        "DeploymentMetadata": {
+            "title": "DeploymentMetadata",
+            "type": "object",
+            "description": "Deployment Metadata",
+            "properties": {
+                "name": {
+                    "description": "Name of deployment",
+                    "type": "string"
+                },
+                "image": {
+                    "description": "Image used by deployment",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "image"
+            ]
+        },
         "CloudWatchConfig": {
             "title": "CloudWatchConfig",
             "type": "object",