Skip to content

Commit

Permalink
changing name of the ui from workspaces-ui to ai-unlimited-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
@alokamsurendra
alokamsurendra committed Aug 26, 2024
1 parent 31569cd commit d425d12
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 85 deletions.
46 changes: 23 additions & 23 deletions deployments/aws/templates/ai-unlimited/ai-unlimited-with-nlb.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Metadata:
- AccessCIDR
- PrefixList
- SecurityGroup
- AiUnlimitedHttpPort
- AiUnlimitedAuthPort
- AiUnlimitedGrpcPort
- AiUnlimitedVersion
- AiUnlimitedSchedulerVersion
Expand Down Expand Up @@ -103,7 +103,7 @@ Parameters:
Type: AWS::EC2::AvailabilityZone::Name
ConstraintDescription: must be the name of a existing subnet.

AiUnlimitedHttpPort:
AiUnlimitedAuthPort:
Description: port to access the AI Unlimited UI.
Type: Number
Default: 3000
Expand Down Expand Up @@ -425,9 +425,9 @@ Resources:
- create_init_api_key
- mount_storage
- install_docker
- configure_workspaces_ui_service
- configure_ai_unlimited_ui_service
- configure_ai_unlimited_service
- start_workspaces_ui_service
- start_ai_unlimited_ui_service
- start_ai_unlimited_service
- configure_ai_unlimited_scheduler_service
- start_ai_unlimited_scheduler_service
Expand Down Expand Up @@ -487,7 +487,7 @@ Resources:
docker:
enabled: "true"
ensureRunning: "true"
configure_workspaces_ui_service:
configure_ai_unlimited_ui_service:
files:
/usr/lib/systemd/system/workspaces-ui.service:
content: !Sub |
Expand All @@ -504,30 +504,30 @@ Resources:
RestartSec=2
ExecStartPre=-/bin/bash -c '/usr/bin/docker network create -d bridge ai_unlimited || true'
ExecStartPre=-/usr/bin/mkdir -p /etc/td/workspaces-ui
ExecStartPre=-/usr/bin/mkdir -p /etc/td/ai-unlimited-ui
EnvironmentFile=/tmp/init_api_key.txt
ExecStartPre=-/usr/bin/docker stop %n || true
ExecStartPre=-/usr/bin/docker rm %n || true
ExecStartPre=/usr/bin/docker pull teradata/ai-unlimited-workspaces-ui:${ AiUnlimitedUiVersion }
ExecStartPre=/usr/bin/docker pull teradata/ai-unlimited-ui:${ AiUnlimitedUiVersion }
ExecStart=/usr/bin/docker run \
-e accept_license=Y \
-e PLATFORM=aws \
-e TD_VCD_UI_PORT=${ AiUnlimitedUiPort } \
-e TD_VCD_API_PORT=3282 \
-e TD_VCD_AUTH_PORT=3000 \
-e TD_VCD_API_PORT=${ AiUnlimitedGrpcPort } \
-e TD_VCD_AUTH_PORT=${ AiUnlimitedAuthPort } \
-e TD_VCD_INIT_API_KEY \
-p ${ AiUnlimitedUiPort }:80 \
--network ai_unlimited \
--rm --name %n teradata/ai-unlimited-workspaces-ui:${ AiUnlimitedUiVersion }
--rm --name %n teradata/ai-unlimited-ui:${ AiUnlimitedUiVersion }
[Install]
WantedBy=multi-user.target
group: root
mode: "000400"
owner: root
start_workspaces_ui_service:
start_ai_unlimited_ui_service:
services:
systemd:
workspaces-ui:
ai-unlimited-ui:
enabled: "true"
ensureRunning: "true"
configure_ai_unlimited_service:
Expand Down Expand Up @@ -555,7 +555,7 @@ Resources:
-e PLATFORM=aws \
-e TD_VCD_INIT_API_KEY \
-v /etc/td/ai-unlimited:/etc/td \
-p ${ AiUnlimitedHttpPort }:3000 \
-p ${ AiUnlimitedAuthPort }:3000 \
-p ${ AiUnlimitedGrpcPort }:3282 \
--network ai_unlimited \
--rm --name %n teradata/ai-unlimited-workspaces:${ AiUnlimitedVersion } workspaces serve -v
Expand Down Expand Up @@ -669,9 +669,9 @@ Resources:
VpcId: !Ref Vpc
GroupDescription: Enable access to AI Unlimited server from LoadBalancer over http, grpc, and ssh
SecurityGroupIngress:
- FromPort: !Ref AiUnlimitedHttpPort
- FromPort: !Ref AiUnlimitedAuthPort
IpProtocol: tcp
ToPort: !Ref AiUnlimitedHttpPort
ToPort: !Ref AiUnlimitedAuthPort
CidrIp: !If
- HASCIDR
- !Ref AccessCIDR
Expand Down Expand Up @@ -764,7 +764,7 @@ Resources:
- Type: forward
TargetGroupArn: !Ref AiUnlimitedHTTPTargetGroup
LoadBalancerArn: !Ref LoadBalancer
Port: !Ref AiUnlimitedHttpPort
Port: !Ref AiUnlimitedAuthPort
Protocol: TCP

AiUnlimitedGRPCListener:
Expand Down Expand Up @@ -827,7 +827,7 @@ Resources:
- td-aiu
- ui
- http
Port: !Ref AiUnlimitedHttpPort
Port: !Ref AiUnlimitedAuthPort
Protocol: TCP
TargetGroupAttributes:
- Key: stickiness.enabled
Expand All @@ -838,7 +838,7 @@ Resources:
Value: "20"
Targets:
- Id: !Ref AiUnlimitedServer
Port: !Ref AiUnlimitedHttpPort
Port: !Ref AiUnlimitedAuthPort
VpcId: !Ref Vpc

AiUnlimitedUITargetGroup:
Expand Down Expand Up @@ -988,8 +988,8 @@ Resources:
GroupDescription: Enable access to AI Unlimited server over http and grpc
SecurityGroupIngress:
- IpProtocol: tcp
FromPort: !Ref AiUnlimitedHttpPort
ToPort: !Ref AiUnlimitedHttpPort
FromPort: !Ref AiUnlimitedAuthPort
ToPort: !Ref AiUnlimitedAuthPort
SourceSecurityGroupId: !GetAtt LoadBalancerAiUnlimitedSecurityGroup.GroupId
- IpProtocol: tcp
FromPort: !Ref AiUnlimitedGrpcPort
Expand All @@ -1002,8 +1002,8 @@ Resources:
- !If
- HASSECURITYGROUP
- IpProtocol: tcp
FromPort: !Ref AiUnlimitedHttpPort
ToPort: !Ref AiUnlimitedHttpPort
FromPort: !Ref AiUnlimitedAuthPort
ToPort: !Ref AiUnlimitedAuthPort
SourceSecurityGroupId: !Ref SecurityGroup
- !Ref AWS::NoValue
- !If
Expand Down Expand Up @@ -1290,7 +1290,7 @@ Outputs:
Description: Loadbalancer access endpoint for AI Unlimited UI Access
Value: !If
- PortIsNotEighty
- !Sub "http://${ LoadBalancer.DNSName }:${ AiUnlimitedUiPort }/landing"
- !Sub "http://${ LoadBalancer.DNSName }:${ AiUnlimitedUiPort }/healthcheck"
- !Sub "http://${ LoadBalancer.DNSName }"

AiUnlimitedApiAccess:
Expand Down
38 changes: 19 additions & 19 deletions deployments/aws/templates/ai-unlimited/ai-unlimited-without-lb.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Metadata:
- AccessCIDR
- PrefixList
- SecurityGroup
- AiUnlimitedHttpPort
- AiUnlimitedAuthPort
- AiUnlimitedGrpcPort
- AiUnlimitedVersion
- AiUnlimitedSchedulerVersion
Expand Down Expand Up @@ -88,7 +88,7 @@ Parameters:
Type: AWS::EC2::AvailabilityZone::Name
ConstraintDescription: must be the name of a existing subnet.

AiUnlimitedHttpPort:
AiUnlimitedAuthPort:
Description: port to access the AI Unlimited UI.
Type: Number
Default: 3000
Expand Down Expand Up @@ -421,9 +421,9 @@ Resources:
- create_init_api_key
- mount_storage
- install_docker
- configure_workspaces_ui_service
- configure_ai_unlimited_ui_service
- configure_ai_unlimited_service
- start_workspaces_ui_service
- start_ai_unlimited_ui_service
- start_ai_unlimited_service
- configure_ai_unlimited_scheduler_service
- start_ai_unlimited_scheduler_service
Expand Down Expand Up @@ -484,12 +484,12 @@ Resources:
enabled: "true"
ensureRunning: "true"

configure_workspaces_ui_service:
configure_ai_unlimited_ui_service:
files:
/usr/lib/systemd/system/workspaces-ui.service:
/usr/lib/systemd/system/ai-unlimited-ui.service:
content: !Sub |
[Unit]
Description=workspaces-ui
Description=ai-unlimited-ui
After=docker.service
Requires=docker.service
StartLimitInterval=200
Expand All @@ -501,30 +501,30 @@ Resources:
RestartSec=2
ExecStartPre=-/bin/bash -c '/usr/bin/docker network create -d bridge ai_unlimited || true'
ExecStartPre=-/usr/bin/mkdir -p /etc/td/workspaces-ui
ExecStartPre=-/usr/bin/mkdir -p /etc/td/ai-unlimited-ui
EnvironmentFile=/tmp/init_api_key.txt
ExecStartPre=-/usr/bin/docker stop %n || true
ExecStartPre=-/usr/bin/docker rm %n || true
ExecStartPre=/usr/bin/docker pull teradata/ai-unlimited-workspaces-ui:${ AiUnlimitedUiVersion }
ExecStartPre=/usr/bin/docker pull teradata/ai-unlimited-ui:${ AiUnlimitedUiVersion }
ExecStart=/usr/bin/docker run \
-e accept_license=Y \
-e PLATFORM=aws \
-e TD_VCD_UI_PORT=${ AiUnlimitedUiPort } \
-e TD_VCD_API_PORT=3282 \
-e TD_VCD_AUTH_PORT=3000 \
-e TD_VCD_API_PORT=${ AiUnlimitedGrpcPort } \
-e TD_VCD_AUTH_PORT=${ AiUnlimitedAuthPort } \
-e TD_VCD_INIT_API_KEY \
-p ${ AiUnlimitedUiPort }:80 \
--network ai_unlimited \
--rm --name %n teradata/ai-unlimited-workspaces-ui:${ AiUnlimitedUiVersion }
--rm --name %n teradata/ai-unlimited-ui:${ AiUnlimitedUiVersion }
[Install]
WantedBy=multi-user.target
group: root
mode: "000400"
owner: root
start_workspaces_ui_service:
start_ai_unlimited_ui_service:
services:
systemd:
workspaces-ui:
ai-unlimited-ui:
enabled: "true"
ensureRunning: "true"

Expand Down Expand Up @@ -553,7 +553,7 @@ Resources:
-e PLATFORM=aws \
-e TD_VCD_INIT_API_KEY \
-v /etc/td/ai-unlimited:/etc/td \
-p ${ AiUnlimitedHttpPort }:3000 \
-p ${ AiUnlimitedAuthPort }:3000 \
-p ${ AiUnlimitedGrpcPort }:3282 \
--network ai_unlimited \
--rm --name %n teradata/ai-unlimited-workspaces:${ AiUnlimitedVersion } workspaces serve -v
Expand Down Expand Up @@ -668,9 +668,9 @@ Resources:
VpcId: !Ref Vpc
GroupDescription: Enable access to AI Unlimited server over http and grpc
SecurityGroupIngress:
- FromPort: !Ref AiUnlimitedHttpPort
- FromPort: !Ref AiUnlimitedAuthPort
IpProtocol: tcp
ToPort: !Ref AiUnlimitedHttpPort
ToPort: !Ref AiUnlimitedAuthPort
CidrIp: !If
- HASCIDR
- !Ref AccessCIDR
Expand Down Expand Up @@ -987,15 +987,15 @@ Outputs:
AiUnlimitedPublicUIAccess:
Description: Teradata AI Unlimited public UI Access
Value: !If [ PortIsNotEightyAndHasPublicIp,
!Sub "http://${AiUnlimitedServer.PublicDnsName}:${AiUnlimitedUiPort}/landing",
!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}/landing"
- !Sub "http://${AiUnlimitedServer.PrivateDnsName}:${AiUnlimitedUiPort}/healthcheck"
- !Sub "http://${AiUnlimitedServer.PrivateDnsName}"

AiUnlimitedPublicAPIAccess:
Expand Down
Loading

0 comments on commit d425d12

Please sign in to comment.