fix template problems

coder · deansheather · Aug 25, 2022 · Aug 18, 2022 · Aug 18, 2022 · Aug 18, 2022
commit 89c3f9966f0cf4809a68f8b2c4532bbc231589c5
diff --git a/cli/server.go b/cli/server.go
@@ -296,8 +296,6 @@ func Server(newAPI func(*coderd.Options) *coderd.API) *cobra.Command {
 				switch autoImportTemplate {
 				case "kubernetes":
 					v = coderd.AutoImportTemplateKubernetes
-				case "kubernetes-multi-service":
-					v = coderd.AutoImportTemplateKubernetesMultiService
 				default:
 					return xerrors.Errorf("auto import template %q is not supported", autoImportTemplate)
 				}
@@ -770,7 +768,7 @@ func Server(newAPI func(*coderd.Options) *coderd.API) *cobra.Command {
 	cliflag.BoolVarP(root.Flags(), &secureAuthCookie, "secure-auth-cookie", "", "CODER_SECURE_AUTH_COOKIE", false, "Specifies if the 'Secure' property is set on browser session cookies")
 	cliflag.StringVarP(root.Flags(), &sshKeygenAlgorithmRaw, "ssh-keygen-algorithm", "", "CODER_SSH_KEYGEN_ALGORITHM", "ed25519", "Specifies the algorithm to use for generating ssh keys. "+
 		`Accepted values are "ed25519", "ecdsa", or "rsa4096"`)
-	cliflag.StringArrayVarP(root.Flags(), &autoImportTemplates, "auto-import-template", "", "CODER_TEMPLATE_AUTOIMPORT", []string{}, "Which templates to auto-import. Available auto-importable templates are: kubernetes, kubernetes-multi-service")
+	cliflag.StringArrayVarP(root.Flags(), &autoImportTemplates, "auto-import-template", "", "CODER_TEMPLATE_AUTOIMPORT", []string{}, "Which templates to auto-import. Available auto-importable templates are: kubernetes")
 	cliflag.BoolVarP(root.Flags(), &spooky, "spooky", "", "", false, "Specifies spookiness level")
 	cliflag.BoolVarP(root.Flags(), &verbose, "verbose", "v", "CODER_VERBOSE", false, "Enables verbose logging.")
 	_ = root.Flags().MarkHidden("spooky")

diff --git a/coderd/templates.go b/coderd/templates.go
@@ -34,8 +34,7 @@ var (
 type AutoImportTemplate string
 
 const (
-	AutoImportTemplateKubernetes             AutoImportTemplate = "kubernetes"
-	AutoImportTemplateKubernetesMultiService AutoImportTemplate = "kubernetes-multi-service"
+	AutoImportTemplateKubernetes AutoImportTemplate = "kubernetes"
 )
 
 // Returns a single template.

diff --git a/coderd/users.go b/coderd/users.go
@@ -137,17 +137,17 @@ func (api *API) postFirstUser(rw http.ResponseWriter, r *http.Request) {
 		// Determine which parameter values to use.
 		parameters := map[string]string{}
 		switch template {
-		case AutoImportTemplateKubernetes, AutoImportTemplateKubernetesMultiService:
+		case AutoImportTemplateKubernetes:
 
 			// Determine the current namespace we're in.
 			const namespaceFile = "/var/run/secrets/kubernetes.io/serviceaccount/namespace"
 			namespace, err := os.ReadFile(namespaceFile)
 			if err != nil {
 				parameters["use_kubeconfig"] = "true" // use ~/.config/kubeconfig
-				parameters["workspaces_namespace"] = "coder-workspaces"
+				parameters["namespace"] = "coder-workspaces"
 			} else {
 				parameters["use_kubeconfig"] = "false" // use SA auth
-				parameters["workspaces_namespace"] = string(bytes.TrimSpace(namespace))
+				parameters["namespace"] = string(bytes.TrimSpace(namespace))
 			}
 
 		default:

diff --git a/coderd/users_test.go b/coderd/users_test.go
@@ -65,7 +65,6 @@ func TestFirstUser(t *testing.T) {
 		// also added to the switch statement below.
 		autoImportTemplates := []coderd.AutoImportTemplate{
 			coderd.AutoImportTemplateKubernetes,
-			coderd.AutoImportTemplateKubernetesMultiService,
 		}
 		client := coderdtest.New(t, &coderdtest.Options{
 			AutoImportTemplates: autoImportTemplates,
@@ -77,10 +76,9 @@ func TestFirstUser(t *testing.T) {
 
 		templates, err := client.TemplatesByOrganization(ctx, u.OrganizationID)
 		require.NoError(t, err, "list templates")
-		require.Len(t, templates, 2, "should have two templates")
+		require.Len(t, templates, len(autoImportTemplates), "listed templates count does not match")
 		require.ElementsMatch(t, autoImportTemplates, []coderd.AutoImportTemplate{
 			coderd.AutoImportTemplate(templates[0].Name),
-			coderd.AutoImportTemplate(templates[1].Name),
 		}, "template names don't match")
 
 		for _, template := range templates {
@@ -91,9 +89,9 @@ func TestFirstUser(t *testing.T) {
 			// Ensure all template parameters are present.
 			expectedParams := map[string]bool{}
 			switch template.Name {
-			case "kubernetes", "kubernetes-multi-service":
+			case "kubernetes":
 				expectedParams["use_kubeconfig"] = false
-				expectedParams["workspaces_namespace"] = false
+				expectedParams["namespace"] = false
 			default:
 				t.Fatalf("unexpected template name %q", template.Name)
 			}

diff --git a/enterprise/coderd/licenses.go b/enterprise/coderd/licenses.go
@@ -37,6 +37,7 @@ var ValidMethods = []string{"EdDSA"}
 
 // key20220812 is the Coder license public key with id 2022-08-12 used to validate licenses signed
 // by our signing infrastructure
+//
 //go:embed keys/2022-08-12
 var key20220812 []byte
 
@@ -134,12 +135,12 @@ func (a *licenseAPI) handler() http.Handler {
 // postLicense adds a new Enterprise license to the cluster.  We allow multiple different licenses
 // in the cluster at one time for several reasons:
 //
-// 1. Upgrades --- if the license format changes from one version of Coder to the next, during a
-//    rolling update you will have different Coder servers that need different licenses to function.
-// 2. Avoid abrupt feature breakage --- when an admin uploads a new license with different features
-//    we generally don't want the old features to immediately break without warning.  With a grace
-//    period on the license, features will continue to work from the old license until its grace
-//    period, then the users will get a warning allowing them to gracefully stop using the feature.
+//  1. Upgrades --- if the license format changes from one version of Coder to the next, during a
+//     rolling update you will have different Coder servers that need different licenses to function.
+//  2. Avoid abrupt feature breakage --- when an admin uploads a new license with different features
+//     we generally don't want the old features to immediately break without warning.  With a grace
+//     period on the license, features will continue to work from the old license until its grace
+//     period, then the users will get a warning allowing them to gracefully stop using the feature.
 func (a *licenseAPI) postLicense(rw http.ResponseWriter, r *http.Request) {
 	if !a.auth.Authorize(r, rbac.ActionCreate, rbac.ResourceLicense) {
 		httpapi.Forbidden(rw)

diff --git a/examples/templates/kubernetes-pod/README.md b/examples/templates/kubernetes-pod/README.md
diff --git a/examples/templates/kubernetes-pod/main.tf b/examples/templates/kubernetes-pod/main.tf