feat: Add conditional to check if the service should expose an extern…

…al endpoint
nearform · Oct 18, 2023 · ea15793 · ea15793
1 parent a4a20f1
commit ea15793
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 20 deletions.
diff --git a/assets/knative/service.yaml.tmpl b/assets/knative/service.yaml.tmpl
@@ -3,6 +3,10 @@ kind: Service
 metadata:
   name: {{ .Name }}
   namespace: default
+  {{ if not .IsPublicService }}
+  labels:
+    networking.knative.dev/visibility=cluster-local
+  {{ end }}
 spec:
   template:
     spec:

diff --git a/src/cli/deploy.go b/src/cli/deploy.go
@@ -26,7 +26,15 @@ func (c *icli) Deploy(cCtx *cli.Context) error {
 		return err
 	}
 
-	return knative.Apply(cCtx.String(namespaceFlag), commitSha, config, project, c.dockerImage, cCtx.String(envVarFileFlag))
+	return knative.Apply(
+        cCtx.String(namespaceFlag),
+        commitSha,
+        config,
+        project,
+        c.dockerImage,
+        cCtx.String(envVarFileFlag),
+        cCtx.Bool(publicServiceFlag),
+	)
 }
 
 func (c icli) DeployCMD() *cli.Command {

diff --git a/src/cli/flags.go b/src/cli/flags.go
@@ -46,6 +46,7 @@ const (
 	stopOnBuildFlag       string = "stop-on-build"
 	stopOnPushFlag        string = "stop-on-push"
 	envVarFileFlag        string = "env-var-file"
+	publicServiceFlag     string = "public-service"
 )
 
 type flags struct {
@@ -114,6 +115,13 @@ func InitFlags() flags {
 					Value:    defaults.EnvVarFile,
 					Category: "deploy",
 				},
+				&cli.BoolFlag{
+					Name:     publicServiceFlag,
+					EnvVars:  []string{"INITIUM_PUBLIC_SERVICE"},
+					Required: false,
+					Value:    true,
+					Category: "deploy",
+				},
 			},
 			Registry: []cli.Flag{
 				&cli.StringFlag{

diff --git a/src/cli/init.go b/src/cli/init.go
@@ -71,21 +71,32 @@ func (c icli) InitConfigCMD(ctx *cli.Context) error {
 	config := ""
 	for _, flag := range f {
 		switch flag.(type) {
-		case *cli.StringFlag:
-			stringFlag := flag.(*cli.StringFlag)
-			if slices.Contains(excludedFlags, stringFlag.Name) {
-				continue
-			}
-
-			n = stringFlag.Name
-			v = ctx.String(stringFlag.Name)
-		case *cli.StringSliceFlag:
-			stringSliceFlag := flag.(*cli.StringSliceFlag)
-			if slices.Contains(excludedFlags, stringSliceFlag.Name) {
-				continue
-			}
-			n = stringSliceFlag.Name
-			v = strings.Join(ctx.StringSlice(stringSliceFlag.Name), ",")
+            case *cli.StringFlag:
+                stringFlag := flag.(*cli.StringFlag)
+                if slices.Contains(excludedFlags, stringFlag.Name) {
+                    continue
+                }
+
+                n = stringFlag.Name
+                v = ctx.String(stringFlag.Name)
+            case *cli.StringSliceFlag:
+                stringSliceFlag := flag.(*cli.StringSliceFlag)
+                if slices.Contains(excludedFlags, stringSliceFlag.Name) {
+                    continue
+                }
+                n = stringSliceFlag.Name
+                v = strings.Join(ctx.StringSlice(stringSliceFlag.Name), ",")
+            case *cli.BoolFlag:
+                boolFlag := flag.(*cli.BoolFlag)
+                if slices.Contains(excludedFlags, boolFlag.Name) {
+                    continue
+                }
+                n = boolFlag.Name
+                if ctx.Bool(boolFlag.Name) {
+                    v = "true"
+                } else {
+                    v = "false"
+                }
 		}
 
 		if v == "" {

diff --git a/src/services/k8s/knative.go b/src/services/k8s/knative.go
@@ -46,7 +46,7 @@ func Config(endpoint string, token string, caCrt []byte) (*rest.Config, error) {
 	}, nil
 }
 
-func loadManifest(namespace string, commitSha string, project *project.Project, dockerImage docker.DockerImage, envFile string) (*servingv1.Service, error) {
+func loadManifest(namespace string, commitSha string, project *project.Project, dockerImage docker.DockerImage, envFile string, isPublicService bool) (*servingv1.Service, error) {
 	knativeTemplate := path.Join("assets", "knative", "service.yaml.tmpl")
 	template, err := template.ParseFS(project.Resources, knativeTemplate)
 	if err != nil {
@@ -57,6 +57,7 @@ func loadManifest(namespace string, commitSha string, project *project.Project,
 		"Name": dockerImage.Name,
 		"RemoteTag": dockerImage.RemoteTag(),
 		"ImagePullSecrets": project.ImagePullSecrets,
+		"IsPublicService": isPublicService,
 	}
 
 	output := &bytes.Buffer{}
@@ -156,12 +157,12 @@ func loadEnvFile(envFile string) ([]corev1.EnvVar, error) {
 	return envVarList, nil
 }
 
-func Apply(namespace string, commitSha string, config *rest.Config, project *project.Project, dockerImage docker.DockerImage, envFile string) error {
+func Apply(namespace string, commitSha string, config *rest.Config, project *project.Project, dockerImage docker.DockerImage, envFile string, isPublicService bool) error {
 	log.Info("Deploying Knative service", "host", config.Host, "name", project.Name, "namespace", namespace)
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute*5)
 	defer cancel()
 
-	serviceManifest, err := loadManifest(namespace, commitSha, project, dockerImage, envFile)
+	serviceManifest, err := loadManifest(namespace, commitSha, project, dockerImage, envFile, isPublicService)
 	if err != nil {
 		return err
 	}

diff --git a/src/services/k8s/knative_test.go b/src/services/k8s/knative_test.go
@@ -60,6 +60,8 @@ func TestLoadManifest(t *testing.T) {
 	commitSha := "93f4be93"
 	imagePullSecrets := []string{"secretPassword123"}
 
+	isPublicService = false
+
 	proj := &project.Project{Name: "knative_test",
 		Directory:        path.Join(root, "example"),
 		Resources:        os.DirFS(root),
@@ -73,7 +75,7 @@ func TestLoadManifest(t *testing.T) {
 		Tag:       "v1.1.0",
 	}
 
-	serviceManifest, err := loadManifest(namespace, commitSha, proj, dockerImage, path.Join(root, "example/.env.sample"))
+	serviceManifest, err := loadManifest(namespace, commitSha, proj, dockerImage, path.Join(root, "example/.env.sample"), isPublicService)
 
 	if err != nil {
 		t.Fatalf(fmt.Sprintf("Error: %v", err))