Web SSH Changes (#5140)

Azure · Oct 12, 2021 · 4aae218 · 4aae218
1 parent 23b284d
commit 4aae218
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 12 deletions.
diff --git a/...source-manager/Microsoft.HDInsight/preview/2021-09-15-preview/examples/CreateCluster.json b/...source-manager/Microsoft.HDInsight/preview/2021-09-15-preview/examples/CreateCluster.json
@@ -26,7 +26,11 @@
               "testuser2"
             ]
           },
-          "kafkaProfile": {}
+          "kafkaProfile": {},
+          "sshProfile": {
+            "count": 2,
+            "podPrefix": "pod"
+          }
         }
       }
     }
@@ -63,7 +67,11 @@
                 "fqdn": "cluster1.clusterpool1.westus2.projecthilo.net"
               }
             },
-            "kafkaProfile": {}
+            "kafkaProfile": {},
+            "sshProfile": {
+              "count": 2,
+              "podPrefix": "pod"
+            }
           }
         },
         "systemData": {
@@ -107,7 +115,11 @@
                 "fqdn": "cluster1.clusterpool1.westus2.projecthilo.net"
               }
             },
-            "kafkaProfile": {}
+            "kafkaProfile": {},
+            "sshProfile": {
+              "count": 2,
+              "podPrefix": "pod"
+            }
           }
         },
         "systemData": {

diff --git a/...manager/Microsoft.HDInsight/preview/2021-09-15-preview/examples/CreateSessionCluster.json b/...manager/Microsoft.HDInsight/preview/2021-09-15-preview/examples/CreateSessionCluster.json
@@ -22,7 +22,11 @@
               "testuser2"
             ]
           },
-          "flinkProfile": {}
+          "flinkProfile": {},
+          "sshProfile": {
+            "count": 2,
+            "podPrefix": "pod"
+          }
         }
       }
     }
@@ -54,7 +58,11 @@
                 "fqdn": "sessionCluster1.cluster1.clusterpool1.westus2.projecthilo.net"
               }
             },
-            "flinkProfile": {}
+            "flinkProfile": {},
+            "sshProfile": {
+              "count": 2,
+              "podPrefix": "pod"
+            }
           }
         },
         "systemData": {
@@ -94,7 +102,11 @@
                 "fqdn": "sessionCluster1.cluster1.clusterpool1.westus2.projecthilo.net"
               }
             },
-            "flinkProfile": {}
+            "flinkProfile": {},
+            "sshProfile": {
+              "count": 2,
+              "podPrefix": "pod"
+            }
           }
         },
         "systemData": {

diff --git a/.../resource-manager/Microsoft.HDInsight/preview/2021-09-15-preview/examples/GetCluster.json b/.../resource-manager/Microsoft.HDInsight/preview/2021-09-15-preview/examples/GetCluster.json
@@ -38,7 +38,11 @@
                 "fqdn": "cluster1.clusterpool1.westus2.projecthilo.net"
               }
             },
-            "kafkaProfile": {}
+            "kafkaProfile": {},
+            "sshProfile": {
+              "count": 2,
+              "podPrefix": "pod"
+            }
           }
         },
         "systemData": {

diff --git a/...ce-manager/Microsoft.HDInsight/preview/2021-09-15-preview/examples/GetSessionCluster.json b/...ce-manager/Microsoft.HDInsight/preview/2021-09-15-preview/examples/GetSessionCluster.json
@@ -34,7 +34,11 @@
                 "fqdn": "sessionCluster1.cluster1.clusterpool1.westus2.projecthilo.net"
               }
             },
-            "flinkProfile": {}
+            "flinkProfile": {},
+            "sshProfile": {
+              "count": 2,
+              "podPrefix": "pod"
+            }
           }
         },
         "systemData": {

diff --git a/...icrosoft.HDInsight/preview/2021-09-15-preview/examples/ListClustersByClusterPoolName.json b/...icrosoft.HDInsight/preview/2021-09-15-preview/examples/ListClustersByClusterPoolName.json
@@ -39,7 +39,11 @@
                     "fqdn": "cluster1.clusterpool1.westus2.projecthilo.net"
                   }
                 },
-                "kafkaProfile": {}
+                "kafkaProfile": {},
+                "sshProfile": {
+                  "count": 2,
+                  "podPrefix": "pod"
+                }
               }
             },
             "location": "West US 2",

diff --git a/...osoft.HDInsight/preview/2021-09-15-preview/examples/ListSessionClustersByClusterName.json b/...osoft.HDInsight/preview/2021-09-15-preview/examples/ListSessionClustersByClusterName.json
@@ -35,7 +35,11 @@
                     "fqdn": "sessionCluster1.cluster1.clusterpool1.westus2.projecthilo.net"
                   }
                 },
-                "flinkProfile": {}
+                "flinkProfile": {},
+                "sshProfile": {
+                  "count": 2,
+                  "podPrefix": "pod"
+                }
               }
             },
             "location": "West US 2",

diff --git a/...esource-manager/Microsoft.HDInsight/preview/2021-09-15-preview/examples/PatchCluster.json b/...esource-manager/Microsoft.HDInsight/preview/2021-09-15-preview/examples/PatchCluster.json
@@ -44,7 +44,11 @@
                 "fqdn": "cluster1.clusterpool1.westus2.projecthilo.net"
               }
             },
-            "kafkaProfile": {}
+            "kafkaProfile": {},
+            "sshProfile": {
+              "count": 2,
+              "podPrefix": "pod"
+            }
           }
         },
         "systemData": {

diff --git a/...-manager/Microsoft.HDInsight/preview/2021-09-15-preview/examples/PatchSessionCluster.json b/...-manager/Microsoft.HDInsight/preview/2021-09-15-preview/examples/PatchSessionCluster.json
@@ -40,7 +40,11 @@
                 "fqdn": "sessionCluster1.cluster1.clusterpool1.westus2.projecthilo.net"
               }
             },
-            "flinkProfile": {}
+            "flinkProfile": {},
+            "sshProfile": {
+              "count": 2,
+              "podPrefix": "pod"
+            }
           }
         },
         "systemData": {

diff --git a/.../hdinsight/resource-manager/Microsoft.HDInsight/preview/2021-09-15-preview/hdinsight.json b/.../hdinsight/resource-manager/Microsoft.HDInsight/preview/2021-09-15-preview/hdinsight.json
@@ -1609,6 +1609,9 @@
         "logAnalyticsProfile": {
           "$ref": "#/definitions/ClusterLogAnalyticsProfile"
         },
+        "sshProfile": {
+          "$ref": "#/definitions/SshProfile"
+        },
         "kafkaProfile": {
           "type": "object",
           "description": "Kafka cluster profile.",
@@ -1642,6 +1645,30 @@
       },
       "description": "Cluster profile."
     },
+    "SshProfile": {
+      "type": "object",
+      "description": "Ssh profile for the cluster.",
+      "required": [
+        "count"
+      ],
+      "properties": {
+        "count": {
+          "type": "integer",
+          "description": "Number of ssh pods per cluster.",
+          "format": "int32",
+          "maximum": 5.0,
+          "minimum": 0.0
+        },
+        "podPrefix": {
+          "type": "string",
+          "description": "Prefix of the pod names. Pod number will be appended to the prefix. The ingress URLs for the pods will be available at <clusterFqdn>/<sshBasePath>/<prefix>-<number>",
+          "minLength": 1,
+          "maxLength": 58,
+          "pattern": "^[a-z]([-a-z0-9]*[a-z0-9])?$",
+          "default": "pod"
+        }
+      }
+    },
     "ClusterResourceProperties": {
       "type": "object",
       "required": [