use ide-proxy provide ide logo

Author: iQQBot

chart/templates/proxy-configmap.yaml

@@ -66,13 +66,13 @@ data:
 
 {{- if not .Values.components.ideProxy.disabled }}
   vhost.ide: |
-    https://ide-proxy.{$GITPOD_DOMAIN} {
+    https://ide.{$GITPOD_DOMAIN} {
       import enable_log_debug
       import remove_server_header
       import ssl_configuration
 
       reverse_proxy  {
-        to ide.{$KUBE_NAMESPACE}.{$KUBE_DOMAIN}:{{.Values.components.ideProxy.ports.http.servicePort}}
+        to ide-proxy.{$KUBE_NAMESPACE}.{$KUBE_DOMAIN}:{{.Values.components.ideProxy.ports.http.servicePort}}
       }
     }
 {{- end }}

chart/templates/server-ide-configmap.yaml

@@ -46,13 +46,13 @@ options:
     orderKey: "00"
     title: "VS Code"
     type: "browser"
-    logo: "vscode"
+    logo: "https://ide.{{ $.Values.hostname }}/image/ide-logo/vscode.svg"
     image: {{ (include "stable-image-full" (dict "root" $ "gp" $gp "comp" $gp.components.workspace.codeImage)) }}
   code-latest:
     orderKey: "01"
     title: "VS Code"
     type: "browser"
-    logo: "vscode-insiders"
+    logo: "https://ide.{{ $.Values.hostname }}/image/ide-logo/vscodeInsiders.svg"
     tooltip: "Early access version, still subject to testing."
     label: "Insiders"
     image: {{ (include "insider-image-full" (dict "root" $ "gp" $gp "comp" $gp.components.workspace.codeImage)) }}
@@ -63,42 +63,42 @@ options:
     orderKey: "02"
     title: "VS Code"
     type: "desktop"
-    logo: "vscode"
+    logo: "https://ide.{{ $.Values.hostname }}/image/ide-logo/vscode.svg"
     image: {{ (include "gitpod.comp.imageFull" (dict "root" $ "gp" $gp "comp" $gp.components.workspace.desktopIdeImages.codeDesktop)) }}
   code-desktop-insiders:
     orderKey: "03"
     title: "VS Code"
     type: "desktop"
-    logo: "vscode-insiders"
+    logo: "https://ide.{{ $.Values.hostname }}/image/ide-logo/vscodeInsiders.svg"
     tooltip: "Visual Studio Code Insiders for early adopters."
     label: "Insiders"
     image: {{ (include "gitpod.comp.imageFull" (dict "root" $ "gp" $gp "comp" $gp.components.workspace.desktopIdeImages.codeDesktopInsiders)) }}
   intellij:
     orderKey: "04"
     title: "IntelliJ IDEA"
     type: "desktop"
-    logo: "intellij-idea"
+    logo: "https://ide.{{ $.Values.hostname }}/image/ide-logo/intellijIdeaLogo.svg"
     notes: ["While in beta, when you open a workspace with IntelliJ IDEA you will need to use the password “gitpod”."]
     image: {{ (include "gitpod.comp.imageFull" (dict "root" $ "gp" $gp "comp" $gp.components.workspace.desktopIdeImages.intellij)) }}
   goland:
     orderKey: "05"
     title: "GoLand"
     type: "desktop"
-    logo: "goland"
+    logo: "https://ide.{{ $.Values.hostname }}/image/ide-logo/golandLogo.svg"
     notes: ["While in beta, when you open a workspace with GoLand you will need to use the password “gitpod”."]
     image: {{ (include "gitpod.comp.imageFull" (dict "root" $ "gp" $gp "comp" $gp.components.workspace.desktopIdeImages.goland)) }}
   pycharm:
     orderKey: "06"
     title: "PyCharm"
     type: "desktop"
-    logo: "https://upload.wikimedia.org/wikipedia/commons/1/1d/PyCharm_Icon.svg"
+    logo: "https://ide.{{ $.Values.hostname }}/image/ide-logo/pycharmLogo.svg"
     notes: ["While in beta, when you open a workspace with PyCharm you will need to use the password “gitpod”."]
     image: {{ (include "gitpod.comp.imageFull" (dict "root" $ "gp" $gp "comp" $gp.components.workspace.desktopIdeImages.pycharm)) }}
   phpstorm:
     orderKey: "07"
     title: "PhpStorm"
     type: "desktop"
-    logo: "https://upload.wikimedia.org/wikipedia/commons/c/c9/PhpStorm_Icon.svg"
+    logo: "https://ide.{{ $.Values.hostname }}/image/ide-logo/phpstormLogo.svg"
     notes: ["While in beta, when you open a workspace with PhpStorm you will need to use the password “gitpod”."]
     image: {{ (include "gitpod.comp.imageFull" (dict "root" $ "gp" $gp "comp" $gp.components.workspace.desktopIdeImages.phpstorm)) }}
 

components/dashboard/src/images/golandLogo.svg

@@ -12,7 +12,6 @@ import { PageWithSubMenu } from "../components/PageWithSubMenu";
 import PillLabel from "../components/PillLabel";
 import SelectableCard from "../components/SelectableCard";
 import Tooltip from "../components/Tooltip";
-import ideLogos from '../images/ideLogos';
 import { getGitpodService } from "../service/service";
 import { ThemeContext } from "../theme-context";
 import { UserContext } from "../user-context";
@@ -215,7 +214,7 @@ function renderIdeOption(option: IDEOption, selected: boolean, onSelect: () => v
     const card = <SelectableCard className="w-36 h-40" title={option.title} selected={selected} onClick={onSelect}>
         <div className="flex justify-center mt-3">
             <img className="w-16 filter-grayscale self-center"
-                src={option.logo.startsWith("http") ? option.logo : ideLogos[option.logo]} />
+                src={option.logo} alt="logo" />
         </div>
         {option.label ? <div className={`font-semibold text-sm ${selected ? 'text-green-500' : 'text-gray-500 dark:text-gray-400'} uppercase mt-2 ml-2 px-3 py-1 self-center`}>{option.label}</div> : <></>}
     </SelectableCard>;