Add Init Containers to common definitions (#19855)

* add init containers to common definitions

* move changes to 06-01 preview

* remove repeated container definition

* fix allof syntax

* fix anonymous container definition

* fix lintdiff errors

* fix container allof syntax

* add more init examples

* split baseContainer definition

* remove description

Co-authored-by: p-bouchon <[email protected]>

Author: p-bouchon

specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/CommonDefinitions.json

@@ -34,8 +34,8 @@
         }
       }
     },
-    "Container": {
-      "description": "Container App container definition.",
+    "BaseContainer": {
+      "description": "Container App base container definition.",
       "type": "object",
       "properties": {
         "image": {
@@ -74,24 +74,44 @@
           "$ref": "#/definitions/ContainerResources",
           "description": "Container resource requirements."
         },
-        "probes": {
-          "description": "List of probes for the container.",
+        "volumeMounts": {
+          "description": "Container volume mounts.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/ContainerAppProbe"
+            "$ref": "#/definitions/VolumeMount"
           },
           "x-ms-identifiers": [
-            "type"
+            "volumeName"
           ]
-        },
-        "volumeMounts": {
-          "description": "Container volume mounts.",
+        }
+      }
+    },
+    "InitContainer": {
+      "description": "Container App init container definition",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/BaseContainer"
+        }
+      ]
+    },
+    "Container": {
+      "description": "Container App container definition",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/BaseContainer"
+        }
+      ],
+      "properties": {
+        "probes": {
+          "description": "List of probes for the container.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/VolumeMount"
+            "$ref": "#/definitions/ContainerAppProbe"
           },
           "x-ms-identifiers": [
-            "volumeName"
+            "type"
           ]
         }
       }
@@ -495,6 +515,16 @@
           "description": "User friendly suffix that is appended to the revision name",
           "type": "string"
         },
+        "initContainers": {
+          "description": "List of specialized containers that run before app containers.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/InitContainer"
+          },
+          "x-ms-identifiers": [
+            "name"
+          ]
+        },
         "containers": {
           "description": "List of container definitions for the Container App.",
           "type": "array",

specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json

@@ -80,6 +80,23 @@
               ]
             }
           ],
+          "initContainers": [
+            {
+              "image": "repo/testcontainerApp0:v4",
+              "name": "testinitcontainerApp0",
+              "resources": {
+                "cpu": 0.2,
+                "memory": "100Mi"
+              },
+              "command": [
+                "/bin/sh"
+              ],
+              "args": [
+                "-c",
+                "while true; do echo hello; sleep 10;done"
+              ]
+            }
+          ],
           "scale": {
             "minReplicas": 1,
             "maxReplicas": 5,
@@ -190,6 +207,23 @@
                 ]
               }
             ],
+            "initContainers": [
+              {
+                "image": "repo/testcontainerApp0:v4",
+                "name": "testinitcontainerApp0",
+                "resources": {
+                  "cpu": 0.2,
+                  "memory": "100Mi"
+                },
+                "command": [
+                  "/bin/sh"
+                ],
+                "args": [
+                  "-c",
+                  "while true; do echo hello; sleep 10;done"
+                ]
+              }
+            ],
             "scale": {
               "minReplicas": 1,
               "maxReplicas": 5,
@@ -272,6 +306,23 @@
                 ]
               }
             ],
+            "initContainers": [
+              {
+                "image": "repo/testcontainerApp0:v4",
+                "name": "testinitcontainerApp0",
+                "resources": {
+                  "cpu": 0.2,
+                  "memory": "100Mi"
+                },
+                "command": [
+                  "/bin/sh"
+                ],
+                "args": [
+                  "-c",
+                  "while true; do echo hello; sleep 10;done"
+                ]
+              }
+            ],
             "scale": {
               "minReplicas": 1,
               "maxReplicas": 5,

specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Get.json

@@ -82,6 +82,16 @@
                 }
               }
             ],
+            "initContainers": [
+              {
+                "image": "repo/testcontainerApp0:v4",
+                "name": "testinitcontainerApp0",
+                "resources": {
+                  "cpu": 0.2,
+                  "memory": "100Mi"
+                }
+              }
+            ],
             "scale": {
               "minReplicas": 1,
               "maxReplicas": 5,

specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListByResourceGroup.json

@@ -83,6 +83,16 @@
                     }
                   }
                 ],
+                "initContainers": [
+                  {
+                    "image": "repo/testcontainerApp0:v4",
+                    "name": "testinitcontainerApp0",
+                    "resources": {
+                      "cpu": 0.2,
+                      "memory": "100Mi"
+                    }
+                  }
+                ],
                 "scale": {
                   "minReplicas": 1,
                   "maxReplicas": 5,

specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListBySubscription.json

@@ -82,6 +82,16 @@
                     }
                   }
                 ],
+                "initContainers": [
+                  {
+                    "image": "repo/testcontainerApp0:v4",
+                    "name": "testinitcontainerApp0",
+                    "resources": {
+                      "cpu": 0.2,
+                      "memory": "100Mi"
+                    }
+                  }
+                ],
                 "scale": {
                   "minReplicas": 1,
                   "maxReplicas": 5,

specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Patch.json

@@ -83,6 +83,16 @@
               ]
             }
           ],
+          "initContainers": [
+            {
+              "image": "repo/testcontainerApp0:v4",
+              "name": "testinitcontainerApp0",
+              "resources": {
+                "cpu": 0.2,
+                "memory": "100Mi"
+              }
+            }
+          ],
           "scale": {
             "minReplicas": 1,
             "maxReplicas": 5,