Merge pull request #7283 from XRFoundation/minikube-config-fixes

Changes to make minikube template up to date.

packages/ops/configs/local.template.values.yaml

@@ -1,10 +1,21 @@
 client:
   extraEnv:
+    APP_LOGO: "./logo.svg"
+    API_ASSETS_ROUTE: /static-resource
     API_ASSETS_ACTION: assets
+    API_MEDIA_ROUTE: /media
+    API_MEDIA_SEARCH_ROUTE: "-search"
+    API_META_ROUTE: /meta
+    API_PROJECTS_ROUTE: /project
+    API_RESOLVE_MEDIA_ROUTE: /resolve-media
+    API_PROJECT_PUBLISH_ACTION: /publish-project
+    API_SCENES_ROUTE: /collection
     API_SERVER_ADDRESS: api-local.etherealengine.com
     API_SOCKET_ENDPOINT: /socket
     API_SERVER: https://api-local.etherealengine.com
+    APP_TITLE: EtherealEngine
     CLIENT_ADDRESS: https://local.etherealengine.com
+    CLIENT_ENABLED: "true"
     CLIENT_SCENE_ROUTE: /scenes/
     CLIENT_LOCAL_SCENE_ROUTE: "/scene.html?scene_id="
     CORS_PROXY_SERVER: https://api-local.etherealengine.com
@@ -17,12 +28,19 @@ client:
     NODE_ENV: production
     NON_CORS_PROXY_DOMAINS: "reticulum.io,etherealengine.com,amazonaws.com"
     ROUTER_BASE_PATH: /spoke
+    SERVER_ENABLED: "true"
     SITE_DESC: Connected Worlds for Everyone
     SITE_TITLE: XR3ngine
     THUMBNAIL_ROUTE: /thumbnail/
     THUMBNAIL_SERVER: https://api-local.etherealengine.com
     USE_DIRECT_UPLOAD_API: "true"
     USE_HTTPS: "true"
+    VITE_APP_HOST: local.etherealengine.com
+    VITE_APP_PORT: "3000"
+    VITE_SERVER_HOST: api-local.etherealengine.com
+    VITE_SERVER_PORT: "3030"
+    VITE_INSTANCESERVER_HOST: instanceserver-local.etherealengine.com
+    VITE_INSTANCESERVER_PORT: "3031"
   image:
     repository: xrengine
     pullPolicy: IfNotPresent
@@ -54,7 +72,7 @@ api:
         secret_access_key: <S3_USER_SECRET_KEY>
       s3:
         region: us-east-1
-        static_resource_bucket: xr3ngine-static-resources
+        static_resource_bucket: xrengine-static-resources
       cloudfront:
         domain: resources.etherealengine.com
       sns:
@@ -68,11 +86,11 @@ api:
     APP_HOST: local.etherealengine.com
     APP_URL: https://local.etherealengine.com
     AUTH_SECRET: <AUTH_SECRET_UUID_OR_SIMILAR>
-    ELASTIC_HOST: "http://host.minikube.internal:9200"
     AWS_SMS_ACCESS_KEY_ID: <SNS_USER_ACCESS_KEY>
     AWS_SMS_REGION: <SNS_REGION>
     AWS_SMS_SECRET_ACCESS_KEY: <SNS_USER_SECRET_KEY>
     AWS_SMS_TOPIC_ARN: arn:aws:sns:<SNS_REGION>:<AWS_ACCOUNT_ID>:<SNS_TOPIC_NAME>
+    CLIENT_ENABLED: "false"
     CERT: certs/cert.pem
     KEY: certs/key.pem
     CORS_SERVER_PORT: "3036"
@@ -87,12 +105,12 @@ api:
     GOOGLE_CALLBACK_URL: https://local.etherealengine.com/auth/oauth/google
     GOOGLE_CLIENT_ID: "<GOOGLE_CLIENT_ID>"
     GOOGLE_CLIENT_SECRET: "<GOOGLE_CLIENT_SECRET>"
-    LOCAL: "true"
+    LOCAL: "false"
     MAGICLINK_EMAIL_SUBJECT: Login to XR3ngine
     MAIL_FROM: info@login.etherealengine.com
+    SERVE_CLIENT_FROM_STORAGE_PROVIDER: "true"
     SEVER_ENABLED: "true"
     SERVER_HOST: "api-local.etherealengine.com"
-    SERVER_MODE: "api"
     SERVER_PORT: "3030"
     SMTP_FROM_EMAIL: info@login.etherealengine.com
     SMTP_FROM_NAME: noreply
@@ -109,6 +127,13 @@ api:
     STORAGE_CLOUDFRONT_DOMAIN: resources.etherealengine.com
     STORAGE_S3_REGION: <S3_REGION>
     STORAGE_S3_STATIC_RESOURCE_BUCKET: xrengine-static-resources
+    VITE_APP_HOST: local.etherealengine.com
+    VITE_APP_PORT: "3000"
+    VITE_SERVER_HOST: api-local.etherealengine.com
+    VITE_SERVER_PORT: "3030"
+    VITE_INSTANCESERVER_HOST: instanceserver-local.etherealengine.com
+    VITE_INSTANCESERVER_PORT: "3031"
+    USE_IPFS: "true"
   image:
     repository: xrengine
     pullPolicy: IfNotPresent
@@ -126,6 +151,9 @@ api:
           proxy_http_version 1.1;
           proxy_pass_request_headers on;
           proxy_hide_header Access-Control-Allow-Origin;
+          proxy_ssl_session_reuse off;
+          add_header Initial-Reverse "first";
+          proxy_ssl_server_name on;
           add_header Access-Control-Allow-Origin $http_origin;
           proxy_intercept_errors on;
           error_page 301 302 307 = @handle_redirects;
@@ -135,8 +163,9 @@ api:
         location @handle_redirects {
           set $saved_redirect_location '$upstream_http_location';
           proxy_pass_request_headers on;
+          add_header Redirect-Reverse "second";
           proxy_hide_header Access-Control-Allow-Origin;
-          add_header Access-Control-Allow-Origin "$http_origin";
+          add_header Access-Control-Allow-Origin $http_origin;
           proxy_pass $saved_redirect_location;
         }
     hosts:
@@ -146,6 +175,7 @@ api:
 
   service:
     type: NodePort
+    corsServerPort: 3036
   replicaCount: 1
 
 media:
@@ -175,27 +205,20 @@ media:
     AWS_SMS_REGION: <SNS_REGION>
     AWS_SMS_SECRET_ACCESS_KEY: <SNS_USER_SECRET_KEY>
     AWS_SMS_TOPIC_ARN: arn:aws:sns:<SNS_REGION>:<AWS_ACCOUNT_ID>:<SNS_TOPIC_NAME>
-    CLIENT_ENABLED: "false"
-    CERT: certs/cert.pem
-    KEY: certs/key.pem
-    CORS_SERVER_PORT: "3036"
     FACEBOOK_CALLBACK_URL: https://local.etherealengine.com/auth/oauth/facebook
     FACEBOOK_CLIENT_ID: "<FACEBOOK_CLIENT_ID>"
     FACEBOOK_CLIENT_SECRET: "<FACEBOOK_CLIENT_SECRET>"
     FORCE_DB_REFRESH: "false"
-    INSTANCESERVER_DOMAIN: instanceserver-local.etherealengine.com
     GITHUB_CALLBACK_URL: https://local.etherealengine.com/auth/oauth/github
     GITHUB_CLIENT_ID: "<GITHUB_CLIENT_ID>"
     GITHUB_CLIENT_SECRET: "<GITHUB_CLIENT_SECRET>"
     GOOGLE_CALLBACK_URL: https://local.etherealengine.com/auth/oauth/google
     GOOGLE_CLIENT_ID: "<GOOGLE_CLIENT_ID>"
     GOOGLE_CLIENT_SECRET: "<GOOGLE_CLIENT_SECRET>"
-    LOCAL: "true"
     MAGICLINK_EMAIL_SUBJECT: Login to XR3ngine
     MAIL_FROM: info@login.etherealengine.com
-    SEVER_ENABLED: "true"
+    SERVER_ENABLED: "true"
     SERVER_HOST: "api-local.etherealengine.com"
-    SERVER_PORT: "3030"
     SMTP_FROM_EMAIL: info@login.etherealengine.com
     SMTP_FROM_NAME: noreply
     SMTP_HOST: email-smtp.<SMTP_REGION>.amazonaws.com
@@ -242,14 +265,15 @@ instanceserver:
     APP_URL: https://local.etherealengine.com
     CERT: certs/cert.pem
     KEY: certs/key.pem
+    INSTANCESERVER_ENABLED: "true"
     INSTANCESERVER_PORT: "3031"
     ROUTE53_ACCESS_KEY_ID: <ROUTE53_USER_ACCESS_KEY>
     ROUTE53_ACCESS_KEY_SECRET: <ROUTE53_USER_SECRET_KEY>
     ROUTE53_HOSTED_ZONE_ID: <ROUTE53_HOSTED_ZONE_ID>
     RTC_START_PORT: "40000"
     RTC_END_PORT: "40099"
     RTC_PORT_BLOCK_SIZE: "100"
-    LOCAL: "true"
+    LOCAL: "false"
     INSTANCESERVER_DOMAIN: instanceserver-local.etherealengine.com
     INSTANCESERVER_MODE: "realtime"
     STORAGE_PROVIDER: local
@@ -261,7 +285,9 @@ instanceserver:
     STORAGE_CLOUDFRONT_DOMAIN: resources.etherealengine.com
     STORAGE_S3_REGION: <S3_REGION>
     STORAGE_S3_STATIC_RESOURCE_BUCKET: xrengine-static-resources
+    TS_NODE_IGNORE: (?:^|\/)node_modules\/(?!(@xrengine))
   ingress:
+    disabled: false
     host: instanceserver-local.etherealengine.com
     annotations:
       kubernetes.io/ingress.class: nginx
@@ -281,13 +307,10 @@ instanceserver:
           proxy_pass http://$1:$2/socket.io/?$args;
         }
   buffer:
-    bufferSize: 2
-    minReplicas: 2
+    bufferSize: 4
+    minReplicas: 4
     maxReplicas: 10
-
-redis:
-    enabled: false
-
+
 testbot:
   extraEnv:
     APP_HOST: local.etherealengine.com