Fix blocking merge issues (#12)

* removing comment out of JSON * removing definition of flagHCPResourceID
hashicorp · Sep 28, 2022 · 63cc791 · 63cc791
1 parent 02c30bf
commit 63cc791
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/charts/demo/templates/product-api.yaml b/charts/demo/templates/product-api.yaml
@@ -37,14 +37,14 @@ kind: ConfigMap
 metadata:
   name: db-configmap
 data:
+  # BEGIN CONSUL-K8S MODIFICATION
   config: |
     {
-      # BEGIN CONSUL-K8S MODIFICATION
       "db_connection": "host=postgres.{{ .Release.Namespace }}.svc.cluster.local port=5432 user=postgres password=password dbname=products sslmode=disable",
-      # END CONSUL-K8S MODIFICATION
       "bind_address": ":9090",
       "metrics_address": ":9103"
     }
+  # END CONSUL-K8S MODIFICATION
 ---
 apiVersion: apps/v1
 kind: Deployment

diff --git a/cli/cmd/install/install.go b/cli/cmd/install/install.go
@@ -202,12 +202,6 @@ func (c *Command) init() {
 		Default: "",
 		Usage:   "Set the Kubernetes context to use.",
 	})
-	f.StringVar(&flag.StringVar{
-		Name:    flagHCPResourceID,
-		Target:  &c.flagHCPResourceID,
-		Default: "",
-		Usage:   "Set the HCP resource_id when using the 'cloud' preset.",
-	})
 
 	c.help = c.set.Help()
 }