Merge pull request #301 from jumppad-labs/b-utf8-dnsnames

Sanitize utf8 characters in dns names
jumppad-labs · Aug 9, 2024 · 63b60ac · 63b60ac
2 parents a74ceee + 7e10fa5
commit 63b60ac
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 108 deletions.
diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ resource "k8s_cluster" "k3s" {
   }
 
   copy_image {
-    name = "shipyardrun/connector:v0.1.0"
+    name = "ghcr.io/jumppad-labs/connector:v0.4.0"
   }
 }
 

diff --git a/cmd/server_run.go b/cmd/server_run.go
@@ -102,7 +102,7 @@ func newConnectorRunCommand() *cobra.Command {
 
 			// start the http server in the background
 			l.Info("Starting HTTP server", "bind_addr", httpBindAddr)
-			httpS := http.NewLocalServer(pathCertRoot, pathCertServer, pathKeyServer, grpcBindAddr, httpBindAddr, logger.LoggerAsHCLogger(l))
+			httpS := http.NewLocalServer(pathCertRoot, "", pathCertServer, pathKeyServer, grpcBindAddr, httpBindAddr, logger.LoggerAsHCLogger(l))
 
 			err = httpS.Serve()
 			l.Info("Started")

diff --git a/examples/modules/modules/single_k3s_cluster/k8s.hcl b/examples/modules/modules/single_k3s_cluster/k8s.hcl
@@ -4,7 +4,7 @@ resource "k8s_cluster" "k3s" {
   }
 
   copy_image {
-    name = "shipyardrun/connector:v0.1.0"
+    name = "ghcr.io/jumppad-labs/connector:v0.4.0"
   }
 }
 

diff --git a/examples/remote/connector_config/connector.yaml b/examples/remote/connector_config/connector.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: connector
-        image: shipyardrun/connector:v0.0.1
+        image: ghcr.io/jumppad-labs/connector:v0.4.0
         env:
           - name: BIND_ADDR_GRPC 
             value: "0.0.0.0:30000"

diff --git a/examples/remote/remote_k8s.hcl b/examples/remote/remote_k8s.hcl
@@ -6,39 +6,39 @@ container "remote_k8s" {
   command = "terraform apply -auto-approve"
 
   volume {
-    source = "${data("/terraform/.state/")}"
+    source      = "${data("/terraform/.state/")}"
     destination = "/terraform"
   }
-  
+
   volume {
-    source = "./modules/k8s_doks"
+    source      = "./modules/k8s_doks"
     destination = "/terraform"
   }
-  
+
   volume {
-    source = "${shipyard()}/.config/doks"
+    source      = "${shipyard()}/.config/doks"
     destination = "/terraform/kubeconfig.yaml"
   }
 }
 
 container "local_connector" {
   image {
-    name = "shipyardrun/connector:v0.0.1"
+    name = "ghcr.io/jumppad-labs/connector:v0.4.0"
   }
 
   env_var = {
-    "BIND_ADDR_GRPC": "0.0.0.0:9090"
-    "BIND_ADDR_HTTP": "0.0.0.0:9091"
-    "LOG_LEVEL": "debug"
+    "BIND_ADDR_GRPC" : "0.0.0.0:9090"
+    "BIND_ADDR_HTTP" : "0.0.0.0:9091"
+    "LOG_LEVEL" : "debug"
   }
-  
+
   port_range {
-    range = "9090-9091"
+    range       = "9090-9091"
     enable_host = true
   }
 
   port_range {
-    range = "12000-12100"
+    range       = "12000-12100"
     enable_host = true
   }
 

diff --git a/examples/single_k3s_cluster/k8s.hcl b/examples/single_k3s_cluster/k8s.hcl
@@ -4,7 +4,7 @@ resource "k8s_cluster" "k3s" {
   }
 
   copy_image {
-    name = "shipyardrun/connector:v0.1.0"
+    name = "ghcr.io/jumppad-labs/connector:v0.4.0"
   }
 }
 

diff --git a/go.mod b/go.mod
@@ -34,7 +34,7 @@ require (
 	github.com/hashicorp/hcl/v2 v2.21.0
 	github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f
 	github.com/infinytum/raymond/v2 v2.0.5
-	github.com/jumppad-labs/connector v0.3.0
+	github.com/jumppad-labs/connector v0.4.0
 	github.com/jumppad-labs/gohup v0.4.0
 	github.com/jumppad-labs/hclconfig v0.24.0
 	github.com/jumppad-labs/plugin-sdk v0.1.1-0.20240306185853-c09f71f81b8a
@@ -70,7 +70,6 @@ require (
 	cloud.google.com/go v0.115.0 // indirect
 	cloud.google.com/go/auth v0.7.3 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect
-	cloud.google.com/go/compute v1.27.4 // indirect
 	cloud.google.com/go/compute/metadata v0.5.0 // indirect
 	cloud.google.com/go/iam v1.1.12 // indirect
 	cloud.google.com/go/storage v1.43.0 // indirect
@@ -236,7 +235,6 @@ require (
 	golang.org/x/time v0.6.0 // indirect
 	golang.org/x/tools v0.24.0 // indirect
 	google.golang.org/api v0.190.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20240805194559-2c9e96a0b5d4 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240805194559-2c9e96a0b5d4 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240805194559-2c9e96a0b5d4 // indirect

diff --git a/go.sum b/go.sum
diff --git a/pkg/config/resources/k8s/provider_cluster.go b/pkg/config/resources/k8s/provider_cluster.go
@@ -927,7 +927,7 @@ spec:
       containers:
       - name: connector
         imagePullPolicy: IfNotPresent
-        image: ghcr.io/jumppad-labs/connector:v0.2.1
+        image: ghcr.io/jumppad-labs/connector:v0.4.0
         ports:
           - name: grpc
             containerPort: 60000

diff --git a/pkg/config/resources/nomad/provider_cluster.go b/pkg/config/resources/nomad/provider_cluster.go
@@ -1053,7 +1053,7 @@ job "connector" {
       }
 
       config {
-        image = "ghcr.io/jumppad-labs/connector:v0.2.1"
+        image = "ghcr.io/jumppad-labs/connector:v0.4.0"
 
         ports   = ["http", "grpc"]
         command = "/connector"
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,7 +51,7 @@ resource "k8s_cluster" "k3s" { @@
       }
       copy_image {
-        name = "shipyardrun/connector:v0.1.0"
+        name = "ghcr.io/jumppad-labs/connector:v0.4.0"
       }
     }
@@ Expand Down @@