only show guided install for EC, update styles

replicatedhq · Oct 1, 2024 · a71f0a6 · a71f0a6
1 parent c563d3a
commit a71f0a6
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/kurl_proxy/assets/insecure.html b/kurl_proxy/assets/insecure.html
@@ -71,8 +71,9 @@
       </div>
 
       <div class="min-h-full w-full flex flex-1">
-        <div class="w-[400px] bg-[#F9FBFC]">
-          <div class="py-8 pl-8 shadow-[0_1px_0_#c4c8ca]">
+        {{if .IsEmbeddedCluster}}
+        <div class="bg-[#F9FBFC]">
+          <div class="py-8 pl-8 shadow-[0_1px_0_#c4c8ca] w-[400px]">
             <span class="text-lg font-semibold text-gray-[#323232]">
               Let's get you started!
             </span>
@@ -106,6 +107,7 @@
             </span>
           </div>
         </div>
+        {{end}}
         <div class="tlsContent--wrapper px-8">
           <p class="tls-header my-8">Secure the Admin Console</p>
           <hr />

diff --git a/kurl_proxy/assets/tls-custom.css b/kurl_proxy/assets/tls-custom.css
@@ -600,3 +600,6 @@ p.hidden {
   background-color: #ffffff;
   z-index: 1;
 }
+.tls-content {
+  width: 800px;
+}
diff --git a/kurl_proxy/assets/tls.html b/kurl_proxy/assets/tls.html
@@ -11,7 +11,7 @@
     {{if .AppIcon }}
     <link rel="icon" type="image/png" href="{{ .AppIcon }}" />
     {{end}}
-    <!-- <script src="/tls/assets/tls.js"></script> -->
+    <script src="/tls/assets/tls.js"></script>
   </head>
 
   <body>
@@ -31,8 +31,8 @@
       </div>
 
       <div class="min-h-full w-full flex flex-1">
-        <div class="w-[400px] bg-[#F9FBFC]">
-          <div class="py-8 pl-8 shadow-[0_1px_0_#c4c8ca]">
+        <div class="bg-[#F9FBFC]">
+          <div class="py-8 pl-8 shadow-[0_1px_0_#c4c8ca] w-[400px]">
             <span class="text-lg font-semibold !color-gray-[#323232]">
               Let's get you started!
             </span>
@@ -80,7 +80,7 @@
             </span>
           </div>
         </div>
-        <div class="tlsContent--wrapper px-8 max-w-[1000px]">
+        <div class="tlsContent--wrapper px-8">
           <p class="tls-header my-8">Secure the Admin Console</p>
           <hr />
           <div class="mt-8 p-8 bg-[#F9FBFC] flex-column flex">
@@ -134,7 +134,7 @@
                 will see a warning in your browser every time you access the
                 admin console unless you upload your own TLS certificate.
               </p>
-              <p class="tls-header-sub custom-cert-visible hidden">
+              <p class="tls-header-sub custom-cert-visible hidden tls-content">
                 Upload a trusted certificate to secure communication between
                 your browser and the Admin Console.
               </p>

diff --git a/kurl_proxy/assets/welcome.html b/kurl_proxy/assets/welcome.html
@@ -46,7 +46,7 @@
           <p class="text-2xl font-bold pb-4">
             Welcome to the {{ .AppTitle }} Admin Console
           </p>
-
+          {{if .IsEmbeddedCluster}}
           <p class="mb-8">
             You will be guided through the setup and installation of
             <span class="font-medium"> {{.AppTitle}} </span>
@@ -83,7 +83,7 @@
               </p>
             </div>
           </div>
-
+          {{end}}
           <div class="mt-8 flex justify-center">
             <button
               type="submit"

diff --git a/kurl_proxy/cmd/main.go b/kurl_proxy/cmd/main.go
@@ -273,11 +273,13 @@ func getHttpServer(fingerprint string, acceptAnonymousUploads bool, assetsDir st
 		if err != nil {
 			log.Printf("No kotsadm application metadata: %v", err) // continue
 		}
+
 		appIcon := template.URL(app.Spec.Icon)
 		c.HTML(http.StatusOK, "welcome.html", gin.H{
-			"fingerprintSHA1": fingerprint,
-			"AppIcon":         appIcon,
-			"AppTitle":        app.Spec.Title,
+			"fingerprintSHA1":   fingerprint,
+			"AppIcon":           appIcon,
+			"AppTitle":          app.Spec.Title,
+			"IsEmbeddedCluster": isEmbeddedCluster(),
 		})
 	})
 	r.GET("/insecure", func(c *gin.Context) {