Merge branch '6.0-dev' into 6.2-dev

gomorpheus · Nov 7, 2023 · 04d98e7 · 04d98e7
2 parents 12a7f5b + 37949a1
commit 04d98e7
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 8 deletions.
diff --git a/components/examples/clusterRequest.json b/components/examples/clusterRequest.json
@@ -18,7 +18,8 @@
         "podCidr": "172.20.0.0/16",
         "serviceCidr": "172.30.0.0/16",
         "nodeCount": 3,
-        "createUser": true
+        "createUser": true,
+        "defaultRepoAccount": 22
       },
       "name": "testpool",
       "plan": {

diff --git a/components/examples/integrationDockerRepo.json b/components/examples/integrationDockerRepo.json
@@ -13,6 +13,8 @@
         "username": "bertramqa",
         "password": "************",
         "passwordHash": "64515b216ad31366c5bd9681922cdc13145a",
+        "token": "************",
+        "tokenHash": "e5b4afb1c682f4d6feeec3f50fa3cff26b638087549c17a671747d98db7e6dad",
         "isPlugin": false,
         "config": {},
         "status": null,

diff --git a/components/examples/integrationDockerRepoSuccess.json b/components/examples/integrationDockerRepoSuccess.json
@@ -14,6 +14,8 @@
         "username": "bertramqa",
         "password": "************",
         "passwordHash": "64515b216ad31366c5bd9681922cdc13145a",
+        "token": "************",
+        "tokenHash": "e5b4afb1c682f4d6feeec3f50fa3cff26b638087549c17a671747d98db7e6dad",
         "isPlugin": false,
         "config": {},
         "status": null,

diff --git a/components/schemas/clusterServerCreate.yaml b/components/schemas/clusterServerCreate.yaml
@@ -10,6 +10,11 @@ properties:
       Key for specific host type configuration
 
       The config parameter is for configuration options that are specific to each Provision Type. The Provision Types api can be used to see which options are available.
+    properties: 
+      defaultRepoAccount:
+        type: integer
+        description: Default Git Account to be used when pulling images.  Default behavior is to be anonymous, which does have limits on allowed image pulls from public Docker Repos.
+        nullable: true 
   serverType:
     type: object
     description: Server type to create.  See `/api/server-types` for available server types for the cloud.

diff --git a/components/schemas/integrationDockerRepo.yaml b/components/schemas/integrationDockerRepo.yaml
@@ -29,6 +29,10 @@ properties:
     type: string
   passwordHash: 
     type: string
+  token:
+    type: string
+  tokenHash:
+    type: string
   isPlugin: 
     type: boolean
   config: 

diff --git a/components/schemas/integrationDockerRepoConfig.yaml b/components/schemas/integrationDockerRepoConfig.yaml
@@ -7,9 +7,6 @@ properties:
     required:
       - name
       - type
-      - serviceUrl
-      - serviceUsername
-      - servicePassword
     properties:
       name: 
         type: string
@@ -28,4 +25,7 @@ properties:
         description: Username
       servicePassword:
         type: string
-        description: Password
+        description: Password
+      serviceToken:
+        type: string
+        description: Access Token
diff --git a/components/schemas/networkPoolIp.yaml b/components/schemas/networkPoolIp.yaml
@@ -59,10 +59,12 @@ refType:
   type: string
   nullable: true
 refId:
-  type: string
+  type: integer
+  format: int64
   nullable: true
 subRefId:
-  type: string
+  type: integer
+  format: int64
   nullable: true
 networkDomain:
   type: string

diff --git a/components/schemas/networkPoolIpCreate.yaml b/components/schemas/networkPoolIpCreate.yaml
@@ -5,4 +5,13 @@ properties:
     description: IP Address
   hostname:
     type: string
-    description: Hostname
+    description: Hostname
+  refType:
+    type: string
+    description: Type of associated resource such as a host/server
+    example: ComputeServer
+  refId:
+    type: integer
+    format: int64
+    description: ID of associated resource such as a host/server
+    example: 42