Merge branch 'develop' into feat/regulus-1109/include-workspaces-ui

Teradata · Oct 31, 2024 · fe0d8c4 · fe0d8c4
2 parents 2cf2e76 + 6c53341
commit fe0d8c4
Show file tree

Hide file tree

Showing 24 changed files with 90 additions and 82 deletions.
diff --git a/deployments/aws/templates/ai-unlimited/ai-unlimited-with-nlb.yaml b/deployments/aws/templates/ai-unlimited/ai-unlimited-with-nlb.yaml
@@ -151,7 +151,7 @@ Parameters:
   AiUnlimitedUiVersion:
     Description: Which version of AI Unlimited UI to deploy, uses container version tags, defaults to "latest"
     Type: String
-    Default: v0.0.5
+    Default: v0.0.6
 
   AiUnlimitedSchedulerVersion:
     Description: Which version of AI Unlimited Scheduler to deploy, uses container version tags, defaults to "latest"
@@ -379,7 +379,10 @@ Conditions:
       - !Ref IamRoleName
       - ""
 
-  PortIsNotEighty: !Not [!Equals [!Ref AiUnlimitedUiPort, 80]]
+  PortIsNotEighty: !Not
+    - !Equals
+      - !Ref AiUnlimitedUiPort
+      - 80
 
 Resources:
   AiUnlimitedVolume:
@@ -509,7 +512,7 @@ Resources:
                 TimeoutStartSec=0
                 Restart=always
                 RestartSec=2
-                
+
                 ExecStartPre=-/bin/bash -c '/usr/bin/docker network create -d bridge ai_unlimited || true'
                 ExecStartPre=-/usr/bin/mkdir -p /etc/td/ai-unlimited-ui
                 EnvironmentFile=/etc/td/ai-unlimited/init_api_key.txt
@@ -1301,8 +1304,8 @@ Outputs:
     Description: Loadbalancer access endpoint for AI Unlimited UI Access
     Value: !If
       - PortIsNotEighty
-      - !Sub "http://${ LoadBalancer.DNSName }:${ AiUnlimitedUiPort }/healthcheck"
-      - !Sub "http://${ LoadBalancer.DNSName }"
+      - !Sub http://${ LoadBalancer.DNSName }:${ AiUnlimitedUiPort }/healthcheck
+      - !Sub http://${ LoadBalancer.DNSName }
 
   AiUnlimitedApiAccess:
     Description: Loadbalancer access endpoint for AI Unlimited API Access

diff --git a/deployments/aws/templates/ai-unlimited/ai-unlimited-without-lb.yaml b/deployments/aws/templates/ai-unlimited/ai-unlimited-without-lb.yaml
@@ -141,7 +141,7 @@ Parameters:
   AiUnlimitedUiVersion:
     Description: Which version of AI Unlimited UI to deploy, uses container version tags, defaults to "latest"
     Type: String
-    Default: v0.0.5
+    Default: v0.0.6
 
   RootVolumeSize:
     Description: size of the root disk to the AI Unlimited server.
@@ -364,8 +364,7 @@ Conditions:
       - !Ref IamRoleName
       - ""
 
-  PortIsNotEightyAndHasPublicIp:
-    !And
+  PortIsNotEightyAndHasPublicIp: !And
     - !Not
       - !Equals
         - !Ref Private
@@ -375,7 +374,10 @@ Conditions:
         - !Ref AiUnlimitedUiPort
         - 80
 
-  PortIsNotEighty: !Not [!Equals [!Ref AiUnlimitedUiPort, 80]]
+  PortIsNotEighty: !Not
+    - !Equals
+      - !Ref AiUnlimitedUiPort
+      - 80
 
 Resources:
   AiUnlimitedVolume:
@@ -490,7 +492,6 @@ Resources:
               docker:
                 enabled: "true"
                 ensureRunning: "true"
-
         configure_ai_unlimited_ui_service:
           files:
             /usr/lib/systemd/system/ai-unlimited-ui.service:
@@ -506,7 +507,7 @@ Resources:
                 TimeoutStartSec=0
                 Restart=always
                 RestartSec=2
-                
+
                 ExecStartPre=-/bin/bash -c '/usr/bin/docker network create -d bridge ai_unlimited || true'
                 ExecStartPre=-/usr/bin/mkdir -p /etc/td/ai-unlimited-ui
                 EnvironmentFile=/etc/td/ai-unlimited/init_api_key.txt
@@ -534,7 +535,6 @@ Resources:
               ai-unlimited-ui:
                 enabled: "true"
                 ensureRunning: "true"
-
         configure_ai_unlimited_service:
           files:
             /usr/lib/systemd/system/ai-unlimited.service:
@@ -997,17 +997,18 @@ Outputs:
 
   AiUnlimitedPublicUIAccess:
     Description: Teradata AI Unlimited public UI Access
-    Value: !If [ PortIsNotEightyAndHasPublicIp,
-                 !Sub "http://${AiUnlimitedServer.PublicDnsName}:${AiUnlimitedUiPort}/healthcheck",
-                 !Sub "http://${AiUnlimitedServer.PublicDnsName}" ]
+    Value: !If
+      - PortIsNotEightyAndHasPublicIp
+      - !Sub http://${AiUnlimitedServer.PublicDnsName}:${AiUnlimitedUiPort}/healthcheck
+      - !Sub http://${AiUnlimitedServer.PublicDnsName}
     Condition: HASPUBLICIP
 
   AiUnlimitedPrivateUIAccess:
     Description: Teradata AI Unlimited private UI Access
     Value: !If
       - PortIsNotEighty
-      - !Sub "http://${AiUnlimitedServer.PrivateDnsName}:${AiUnlimitedUiPort}/healthcheck"
-      - !Sub "http://${AiUnlimitedServer.PrivateDnsName}"
+      - !Sub http://${AiUnlimitedServer.PrivateDnsName}:${AiUnlimitedUiPort}/healthcheck
+      - !Sub http://${AiUnlimitedServer.PrivateDnsName}
 
   AiUnlimitedPublicAPIAccess:
     Description: Teradata AI Unlimited public API Access

diff --git a/deployments/aws/templates/all-in-one/all-in-one-with-nlb.yaml b/deployments/aws/templates/all-in-one/all-in-one-with-nlb.yaml
@@ -165,7 +165,7 @@ Parameters:
   AiUnlimitedUiVersion:
     Description: Which version of AI Unlimited UI to deploy, uses container version tags, defaults to "latest"
     Type: String
-    Default: v0.0.5
+    Default: v0.0.6
 
   AiUnlimitedSchedulerVersion:
     Description: Which version of AI Unlimited Scheduler to deploy, uses container version tags, defaults to "latest"
@@ -183,7 +183,7 @@ Parameters:
   JupyterVersion:
     Description: Which version of Jupyter to deploy, uses container version tags, defaults to "latest"
     Type: String
-    Default: latest
+    Default: v0.0.49
 
   RootVolumeSize:
     Description: size of the root disk to the AI Unlimited server.
@@ -395,7 +395,10 @@ Conditions:
       - !Ref IamRoleName
       - ""
 
-  PortIsNotEighty: !Not [!Equals [!Ref AiUnlimitedUiPort, 80]]
+  PortIsNotEighty: !Not
+    - !Equals
+      - !Ref AiUnlimitedUiPort
+      - 80
 
 Resources:
   AiUnlimitedVolume:
@@ -527,7 +530,7 @@ Resources:
                 TimeoutStartSec=0
                 Restart=always
                 RestartSec=2
-                
+
                 ExecStartPre=-/bin/bash -c '/usr/bin/docker network create -d bridge ai_unlimited || true'
                 ExecStartPre=-/usr/bin/mkdir -p /etc/td/ai-unlimited-ui
                 EnvironmentFile=/etc/td/ai-unlimited/init_api_key.txt
@@ -1454,8 +1457,8 @@ Outputs:
     Description: Loadbalancer access endpoint for AI Unlimited UI Access
     Value: !If
       - PortIsNotEighty
-      - !Sub "http://${ LoadBalancer.DNSName }:${ AiUnlimitedUiPort }/healthcheck"
-      - !Sub "http://${ LoadBalancer.DNSName }"
+      - !Sub http://${ LoadBalancer.DNSName }:${ AiUnlimitedUiPort }/healthcheck
+      - !Sub http://${ LoadBalancer.DNSName }
 
   AiUnlimitedApiAccess:
     Description: Loadbalancer access endpoint for AI Unlimited API Access

diff --git a/deployments/aws/templates/all-in-one/all-in-one-without-lb.yaml b/deployments/aws/templates/all-in-one/all-in-one-without-lb.yaml
@@ -155,7 +155,7 @@ Parameters:
   AiUnlimitedUiVersion:
     Description: Which version of AI Unlimited UI to deploy, uses container version tags, defaults to "latest"
     Type: String
-    Default: v0.0.5
+    Default: v0.0.6
 
   JupyterHttpPort:
     Description: port to access the Jupyter UI.
@@ -168,7 +168,7 @@ Parameters:
   JupyterVersion:
     Description: Which version of Jupyter to deploy, uses container version tags, defaults to "latest"
     Type: String
-    Default: latest
+    Default: v0.0.49
 
   RootVolumeSize:
     Description: size of the root disk to the AI Unlimited server.
@@ -380,8 +380,7 @@ Conditions:
       - !Ref IamRoleName
       - ""
 
-  PortIsNotEightyAndHasPublicIp:
-    !And
+  PortIsNotEightyAndHasPublicIp: !And
     - !Not
       - !Equals
         - !Ref Private
@@ -391,7 +390,10 @@ Conditions:
         - !Ref AiUnlimitedUiPort
         - 80
 
-  PortIsNotEighty: !Not [!Equals [!Ref AiUnlimitedUiPort, 80]]
+  PortIsNotEighty: !Not
+    - !Equals
+      - !Ref AiUnlimitedUiPort
+      - 80
 
 Resources:
   AiUnlimitedVolume:
@@ -523,7 +525,7 @@ Resources:
                 TimeoutStartSec=0
                 Restart=always
                 RestartSec=2
-                
+
                 ExecStartPre=-/bin/bash -c '/usr/bin/docker network create -d bridge ai_unlimited || true'
                 ExecStartPre=-/usr/bin/mkdir -p /etc/td/ai-unlimited-ui
                 EnvironmentFile=/etc/td/ai-unlimited/init_api_key.txt
@@ -1077,17 +1079,18 @@ Outputs:
 
   AiUnlimitedPublicUIAccess:
     Description: Teradata AI Unlimited public UI Access
-    Value: !If [ PortIsNotEightyAndHasPublicIp,
-                 !Sub "http://${AiUnlimitedServer.PublicDnsName}:${AiUnlimitedUiPort}/healthcheck",
-                 !Sub "http://${AiUnlimitedServer.PublicDnsName}" ]
+    Value: !If
+      - PortIsNotEightyAndHasPublicIp
+      - !Sub http://${AiUnlimitedServer.PublicDnsName}:${AiUnlimitedUiPort}/healthcheck
+      - !Sub http://${AiUnlimitedServer.PublicDnsName}
     Condition: HASPUBLICIP
 
   AiUnlimitedPrivateUIAccess:
     Description: Teradata AI Unlimited private UI Access
     Value: !If
       - PortIsNotEighty
-      - !Sub "http://${AiUnlimitedServer.PrivateDnsName}:${AiUnlimitedUiPort}/healthcheck"
-      - !Sub "http://${AiUnlimitedServer.PrivateDnsName}"
+      - !Sub http://${AiUnlimitedServer.PrivateDnsName}:${AiUnlimitedUiPort}/healthcheck
+      - !Sub http://${AiUnlimitedServer.PrivateDnsName}
 
   AiUnlimitedPublicAPIAccess:
     Description: Teradata AI Unlimited public API Access

diff --git a/deployments/aws/templates/jupyter/jupyter-with-nlb.yaml b/deployments/aws/templates/jupyter/jupyter-with-nlb.yaml
@@ -120,7 +120,7 @@ Parameters:
   JupyterVersion:
     Description: Which version of jupyter to deploy, uses container version tags, defaults to "latest"
     Type: String
-    Default: latest
+    Default: v0.0.49
 
   RootVolumeSize:
     Description: size of the root disk to the jupyter server.
@@ -753,7 +753,6 @@ Outputs:
     Description: AI Unlimited Security Group
     Value: !GetAtt JupyterSecurityGroup.GroupId
 
-
   LoadBalancerSecurityGroups:
     Description: AI Unlimited Load Balancer Security Group
     Value: !Join

diff --git a/deployments/aws/templates/jupyter/jupyter-without-lb.yaml b/deployments/aws/templates/jupyter/jupyter-without-lb.yaml
@@ -105,7 +105,7 @@ Parameters:
   JupyterVersion:
     Description: Which version of jupyter to deploy, uses container version tags, defaults to "latest"
     Type: String
-    Default: latest
+    Default: v0.0.49
 
   RootVolumeSize:
     Description: size of the root disk to the jupyter server.
@@ -671,7 +671,6 @@ Outputs:
     Description: AI Unlimited Security Group
     Value: !GetAtt JupyterSecurityGroup.GroupId
 
-
   PublicSSHConeection:
     Description: Jupyter ssh connnection string
     Value: !Sub ssh ec2-user@${ JupyterServer.PublicIp }

diff --git a/deployments/azure/templates/arm/ai-unlimited/ai-unlimited-with-nlb.json b/deployments/azure/templates/arm/ai-unlimited/ai-unlimited-with-nlb.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.29.47.4906",
-      "templateHash": "11962177184326515391"
+      "templateHash": "2835298721030345346"
     }
   },
   "parameters": {
@@ -155,7 +155,7 @@
     },
     "AiUnlimitedUIVersion": {
       "type": "string",
-      "defaultValue": "v0.0.5",
+      "defaultValue": "v0.0.6",
       "metadata": {
         "description": "Container Version of the AI Unlimited UI service"
       }

diff --git a/deployments/azure/templates/arm/ai-unlimited/ai-unlimited-without-lb.json b/deployments/azure/templates/arm/ai-unlimited/ai-unlimited-without-lb.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.29.47.4906",
-      "templateHash": "10042357043303845085"
+      "templateHash": "9964344374735929406"
     }
   },
   "parameters": {
@@ -155,7 +155,7 @@
     },
     "AiUnlimitedUIVersion": {
       "type": "string",
-      "defaultValue": "v0.0.5",
+      "defaultValue": "v0.0.6",
       "metadata": {
         "description": "Container Version of the AI Unlimited UI service"
       }

diff --git a/deployments/azure/templates/arm/all-in-one/all-in-one-with-nlb.json b/deployments/azure/templates/arm/all-in-one/all-in-one-with-nlb.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.29.47.4906",
-      "templateHash": "1860230839229358162"
+      "templateHash": "8915778081204530415"
     }
   },
   "parameters": {
@@ -162,14 +162,14 @@
     },
     "AiUnlimitedUIVersion": {
       "type": "string",
-      "defaultValue": "v0.0.5",
+      "defaultValue": "v0.0.6",
       "metadata": {
         "description": "Container Version of the AI Unlimited UI service"
       }
     },
     "JupyterVersion": {
       "type": "string",
-      "defaultValue": "v0.0.43",
+      "defaultValue": "v0.0.49",
       "metadata": {
         "description": "Container Version of the Jupyter Labs service"
       }

diff --git a/deployments/azure/templates/arm/all-in-one/all-in-one-without-lb.json b/deployments/azure/templates/arm/all-in-one/all-in-one-without-lb.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.29.47.4906",
-      "templateHash": "5233063193651485146"
+      "templateHash": "10676142330204484121"
     }
   },
   "parameters": {
@@ -162,14 +162,14 @@
     },
     "AiUnlimitedUIVersion": {
       "type": "string",
-      "defaultValue": "v0.0.5",
+      "defaultValue": "v0.0.6",
       "metadata": {
         "description": "Container Version of the AI Unlimited UI service"
       }
     },
     "JupyterVersion": {
       "type": "string",
-      "defaultValue": "v0.0.43",
+      "defaultValue": "v0.0.49",
       "metadata": {
         "description": "Container Version of the Jupyter Labs service"
       }