update 08/16/24 09:01:29

Qovery · Aug 16, 2024 · 16fb28b · 16fb28b
1 parent c67b876
commit 16fb28b
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 40 deletions.
diff --git a/charts/qovery/values-aws.yaml b/charts/qovery/values-aws.yaml
@@ -48,8 +48,6 @@ qovery:
   domain: &domain set-by-customer
   domainWildcard: &domainWildcard set-by-customer
   qoveryDnsUrl: &qoveryDnsUrl set-by-customer
-  agentGatewayUrl: &agentGatewayUrl set-by-customer
-  engineGatewayUrl: &engineGatewayUrl set-by-customer
   lokiUrl: &lokiUrl set-by-customer
   promtailLokiUrl: &promtailLokiUrl set-by-customer
   acmeEmailAddr: &acmeEmailAddr set-by-customer
@@ -65,7 +63,6 @@ qovery-cluster-agent:
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
-    GRPC_SERVER: *agentGatewayUrl
     LOKI_URL: *lokiUrl
     ORGANIZATION_ID: *organizationId
   useSelfSignCertificate: true
@@ -76,7 +73,6 @@ qovery-shell-agent:
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
-    GRPC_SERVER: *agentGatewayUrl
     ORGANIZATION_ID: *organizationId
 qovery-engine:
   image:
@@ -90,7 +86,7 @@ qovery-engine:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
     DOCKER_HOST: tcp://0.0.0.0:2375
-    GRPC_SERVER: *engineGatewayUrl
+    GRPC_SERVER: engine.qovery.com:443
     LIB_ROOT_DIR: /home/qovery/lib
     ORGANIZATION_ID: *organizationId
 ingress-nginx:

diff --git a/charts/qovery/values-demo-aws.yaml b/charts/qovery/values-demo-aws.yaml
@@ -48,8 +48,6 @@ qovery:
   domain: &domain set-by-customer
   domainWildcard: &domainWildcard set-by-customer
   qoveryDnsUrl: &qoveryDnsUrl set-by-customer
-  agentGatewayUrl: &agentGatewayUrl set-by-customer
-  engineGatewayUrl: &engineGatewayUrl set-by-customer
   lokiUrl: &lokiUrl set-by-customer
   promtailLokiUrl: &promtailLokiUrl set-by-customer
   acmeEmailAddr: &acmeEmailAddr set-by-customer
@@ -65,7 +63,6 @@ qovery-cluster-agent:
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
-    GRPC_SERVER: *agentGatewayUrl
     LOKI_URL: *lokiUrl
     ORGANIZATION_ID: *organizationId
   useSelfSignCertificate: true
@@ -76,7 +73,6 @@ qovery-shell-agent:
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
-    GRPC_SERVER: *agentGatewayUrl
     ORGANIZATION_ID: *organizationId
 qovery-engine:
   image:
@@ -90,7 +86,7 @@ qovery-engine:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
     DOCKER_HOST: tcp://0.0.0.0:2375
-    GRPC_SERVER: *engineGatewayUrl
+    GRPC_SERVER: engine.qovery.com:443
     LIB_ROOT_DIR: /home/qovery/lib
     ORGANIZATION_ID: *organizationId
 ingress-nginx:

diff --git a/charts/qovery/values-demo-gcp.yaml b/charts/qovery/values-demo-gcp.yaml
@@ -46,8 +46,6 @@ qovery:
   domain: &domain set-by-customer
   domainWildcard: &domainWildcard set-by-customer
   qoveryDnsUrl: &qoveryDnsUrl set-by-customer
-  agentGatewayUrl: &agentGatewayUrl set-by-customer
-  engineGatewayUrl: &engineGatewayUrl set-by-customer
   lokiUrl: &lokiUrl set-by-customer
   promtailLokiUrl: &promtailLokiUrl set-by-customer
   acmeEmailAddr: &acmeEmailAddr set-by-customer
@@ -63,7 +61,6 @@ qovery-cluster-agent:
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
-    GRPC_SERVER: *agentGatewayUrl
     LOKI_URL: *lokiUrl
     ORGANIZATION_ID: *organizationId
   useSelfSignCertificate: true
@@ -74,7 +71,6 @@ qovery-shell-agent:
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
-    GRPC_SERVER: *agentGatewayUrl
     ORGANIZATION_ID: *organizationId
 qovery-engine:
   image:
@@ -88,7 +84,7 @@ qovery-engine:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
     DOCKER_HOST: tcp://0.0.0.0:2375
-    GRPC_SERVER: *engineGatewayUrl
+    GRPC_SERVER: engine.qovery.com:443
     LIB_ROOT_DIR: /home/qovery/lib
     ORGANIZATION_ID: *organizationId
 ingress-nginx:

diff --git a/charts/qovery/values-demo-local.yaml b/charts/qovery/values-demo-local.yaml
@@ -48,8 +48,6 @@ qovery:
   domain: &domain set-by-customer
   domainWildcard: &domainWildcard set-by-customer
   qoveryDnsUrl: &qoveryDnsUrl set-by-customer
-  agentGatewayUrl: &agentGatewayUrl set-by-customer
-  engineGatewayUrl: &engineGatewayUrl set-by-customer
   lokiUrl: &lokiUrl set-by-customer
   promtailLokiUrl: &promtailLokiUrl set-by-customer
   acmeEmailAddr: &acmeEmailAddr set-by-customer
@@ -63,15 +61,19 @@ qovery-cluster-agent:
   image:
     tag: *clusterAgentVersion
   environmentVariables:
-    GRPC_SERVER: *agentGatewayUrl
+    CLUSTER_ID: *clusterId
+    CLUSTER_JWT_TOKEN: *jwtToken
     LOKI_URL: ''
+    ORGANIZATION_ID: *organizationId
   useSelfSignCertificate: true
 qovery-shell-agent:
   fullnameOverride: qovery-shell-agent
   image:
     tag: *shellAgentVersion
   environmentVariables:
-    GRPC_SERVER: *agentGatewayUrl
+    CLUSTER_ID: *clusterId
+    CLUSTER_JWT_TOKEN: *jwtToken
+    ORGANIZATION_ID: *organizationId
 qovery-engine:
   image:
     tag: *engineVersion
@@ -84,7 +86,7 @@ qovery-engine:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
     DOCKER_HOST: tcp://0.0.0.0:2375
-    GRPC_SERVER: *engineGatewayUrl
+    GRPC_SERVER: engine.qovery.com:443
     LIB_ROOT_DIR: /home/qovery/lib
     ORGANIZATION_ID: *organizationId
 ingress-nginx:

diff --git a/charts/qovery/values-demo-scaleway.yaml b/charts/qovery/values-demo-scaleway.yaml
@@ -46,8 +46,6 @@ qovery:
   domain: &domain set-by-customer
   domainWildcard: &domainWildcard set-by-customer
   qoveryDnsUrl: &qoveryDnsUrl set-by-customer
-  agentGatewayUrl: &agentGatewayUrl set-by-customer
-  engineGatewayUrl: &engineGatewayUrl set-by-customer
   lokiUrl: &lokiUrl set-by-customer
   promtailLokiUrl: &promtailLokiUrl set-by-customer
   acmeEmailAddr: &acmeEmailAddr set-by-customer
@@ -63,7 +61,6 @@ qovery-cluster-agent:
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
-    GRPC_SERVER: *agentGatewayUrl
     LOKI_URL: *lokiUrl
     ORGANIZATION_ID: *organizationId
   useSelfSignCertificate: true
@@ -74,7 +71,6 @@ qovery-shell-agent:
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
-    GRPC_SERVER: *agentGatewayUrl
     ORGANIZATION_ID: *organizationId
 qovery-engine:
   image:
@@ -88,7 +84,7 @@ qovery-engine:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
     DOCKER_HOST: tcp://0.0.0.0:2375
-    GRPC_SERVER: *engineGatewayUrl
+    GRPC_SERVER: engine.qovery.com:443
     LIB_ROOT_DIR: /home/qovery/lib
     ORGANIZATION_ID: *organizationId
 ingress-nginx:

diff --git a/charts/qovery/values-gcp.yaml b/charts/qovery/values-gcp.yaml
@@ -46,8 +46,6 @@ qovery:
   domain: &domain set-by-customer
   domainWildcard: &domainWildcard set-by-customer
   qoveryDnsUrl: &qoveryDnsUrl set-by-customer
-  agentGatewayUrl: &agentGatewayUrl set-by-customer
-  engineGatewayUrl: &engineGatewayUrl set-by-customer
   lokiUrl: &lokiUrl set-by-customer
   promtailLokiUrl: &promtailLokiUrl set-by-customer
   acmeEmailAddr: &acmeEmailAddr set-by-customer
@@ -63,7 +61,6 @@ qovery-cluster-agent:
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
-    GRPC_SERVER: *agentGatewayUrl
     LOKI_URL: *lokiUrl
     ORGANIZATION_ID: *organizationId
   useSelfSignCertificate: true
@@ -74,7 +71,6 @@ qovery-shell-agent:
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
-    GRPC_SERVER: *agentGatewayUrl
     ORGANIZATION_ID: *organizationId
 qovery-engine:
   image:
@@ -88,7 +84,7 @@ qovery-engine:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
     DOCKER_HOST: tcp://0.0.0.0:2375
-    GRPC_SERVER: *engineGatewayUrl
+    GRPC_SERVER: engine.qovery.com:443
     LIB_ROOT_DIR: /home/qovery/lib
     ORGANIZATION_ID: *organizationId
 ingress-nginx:

diff --git a/charts/qovery/values-scaleway.yaml b/charts/qovery/values-scaleway.yaml
@@ -46,8 +46,6 @@ qovery:
   domain: &domain set-by-customer
   domainWildcard: &domainWildcard set-by-customer
   qoveryDnsUrl: &qoveryDnsUrl set-by-customer
-  agentGatewayUrl: &agentGatewayUrl set-by-customer
-  engineGatewayUrl: &engineGatewayUrl set-by-customer
   lokiUrl: &lokiUrl set-by-customer
   promtailLokiUrl: &promtailLokiUrl set-by-customer
   acmeEmailAddr: &acmeEmailAddr set-by-customer
@@ -63,7 +61,6 @@ qovery-cluster-agent:
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
-    GRPC_SERVER: *agentGatewayUrl
     LOKI_URL: *lokiUrl
     ORGANIZATION_ID: *organizationId
   useSelfSignCertificate: true
@@ -74,7 +71,6 @@ qovery-shell-agent:
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
-    GRPC_SERVER: *agentGatewayUrl
     ORGANIZATION_ID: *organizationId
 qovery-engine:
   image:
@@ -88,7 +84,7 @@ qovery-engine:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
     DOCKER_HOST: tcp://0.0.0.0:2375
-    GRPC_SERVER: *engineGatewayUrl
+    GRPC_SERVER: engine.qovery.com:443
     LIB_ROOT_DIR: /home/qovery/lib
     ORGANIZATION_ID: *organizationId
 ingress-nginx:

diff --git a/charts/qovery/values.yaml b/charts/qovery/values.yaml
@@ -48,8 +48,6 @@ qovery:
   domain: '&domain set-by-customer'
   domainWildcard: '&domainWildcard set-by-customer'
   qoveryDnsUrl: '&qoveryDnsUrl set-by-customer'
-  agentGatewayUrl: '&agentGatewayUrl set-by-customer'
-  engineGatewayUrl: '&engineGatewayUrl set-by-customer'
   lokiUrl: '&lokiUrl set-by-customer'
   promtailLokiUrl: '&promtailLokiUrl set-by-customer'
   acmeEmailAddr: '&acmeEmailAddr set-by-customer'
@@ -65,7 +63,6 @@ qovery-cluster-agent:
   environmentVariables:
     CLUSTER_ID: '*clusterId'
     CLUSTER_JWT_TOKEN: '*jwtToken'
-    GRPC_SERVER: '*agentGatewayUrl'
     LOKI_URL: '*lokiUrl'
     ORGANIZATION_ID: '*organizationId'
   useSelfSignCertificate: true
@@ -76,7 +73,6 @@ qovery-shell-agent:
   environmentVariables:
     CLUSTER_ID: '*clusterId'
     CLUSTER_JWT_TOKEN: '*jwtToken'
-    GRPC_SERVER: '*agentGatewayUrl'
     ORGANIZATION_ID: '*organizationId'
 qovery-engine:
   image:
@@ -90,7 +86,7 @@ qovery-engine:
     CLUSTER_ID: '*clusterId'
     CLUSTER_JWT_TOKEN: '*jwtToken'
     DOCKER_HOST: tcp://0.0.0.0:2375
-    GRPC_SERVER: '*engineGatewayUrl'
+    GRPC_SERVER: engine.qovery.com:443
     LIB_ROOT_DIR: /home/qovery/lib
     ORGANIZATION_ID: '*organizationId'
 ingress-nginx: {}