dataplane: Fix certificate path and listening port (#637)

Fix the key path and listening port for datapalne to support Openshift.

Signed-off-by: Kfir Toledo <[email protected]>

cmd/cl-controlplane/app/server.go

@@ -54,7 +54,7 @@ const (
 	// CertificateFile is the path to the certificate file.
 	CertificateFile = "/etc/ssl/certs/clink-controlplane.pem"
 	// KeyFile is the path to the private-key file.
-	KeyFile = "/etc/ssl/private/clink-controlplane.pem"
+	KeyFile = "/etc/ssl/key/clink-controlplane.pem"
 
 	// PeerTLSDirectory is the path to the directory holding the peer TLS certificates.
 	PeerTLSDirectory = "/etc/ssl/certs/clink"

cmd/cl-dataplane/app/envoyconf.go

@@ -22,7 +22,7 @@ admin:
   address:
     socket_address:
       address: 127.0.0.1
-      port_value: 1000
+      port_value: 1500
 bootstrap_extensions:
 - name: envoy.bootstrap.internal_listener
   typed_config:

cmd/cl-dataplane/app/server.go

@@ -34,7 +34,7 @@ const (
 	// CertificateFile is the path to the certificate file.
 	CertificateFile = "/etc/ssl/certs/clink-dataplane.pem"
 	// KeyFile is the path to the private-key file.
-	KeyFile = "/etc/ssl/private/clink-dataplane.pem"
+	KeyFile = "/etc/ssl/key/clink-dataplane.pem"
 
 	// Name is the app label of dataplane pods.
 	Name = "cl-dataplane"

cmd/cl-go-dataplane/app/server.go

@@ -45,7 +45,7 @@ const (
 	// CertificateFile is the path to the certificate file.
 	CertificateFile = "/etc/ssl/certs/clink-dataplane.pem"
 	// KeyFile is the path to the private-key file.
-	KeyFile = "/etc/ssl/private/clink-dataplane.pem"
+	KeyFile = "/etc/ssl/key/clink-dataplane.pem"
 )
 
 // Options contains everything necessary to create and run a dataplane.

pkg/dataplane/api/servername.go

@@ -15,5 +15,5 @@ package api
 
 const (
 	// ListenPort is the dataplane external listening port.
-	ListenPort = 443
+	ListenPort = 4443
 )