Updated cert paths and bumped version to 2.0.0

.github/workflows/on-pull-request.yml

@@ -10,8 +10,8 @@ jobs:
     strategy:
       matrix:
         go-version:
-          - 1.19.x
           - 1.20.x
+          - 1.21.x
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     steps:

Dockerfile

@@ -1,5 +1,5 @@
 # Build image
-FROM --platform=$BUILDPLATFORM golang:1.20.3 as build
+FROM --platform=$BUILDPLATFORM golang:1.21.0 as build
 ARG BUILDPLATFORM
 ARG TARGETPLATFORM
 # https://github.com/docker/buildx/issues/510#issuecomment-768432329

contrib/charts/gubernator/Chart.yaml

@@ -4,6 +4,6 @@ description: A Helm Chart for gubernator
 
 type: application
 
-version: 2.0.0-rc.50
+version: 2.0.0
 
-appVersion: 2.0.0-rc.50
+appVersion: 2.0.0

contrib/update-version.sh

@@ -20,5 +20,5 @@ echo "Updating version file..."
 echo v$version > version
 
 echo "Updating Helm chart..."
-sed -i '' 's/^version:.*$/version: '$version'/' charts/gubernator/Chart.yaml
-sed -i '' 's/^appVersion:.*$/appVersion: '$version'/' charts/gubernator/Chart.yaml
+sed -i '' 's/^version:.*$/version: '$version'/' contrib/charts/gubernator/Chart.yaml
+sed -i '' 's/^appVersion:.*$/appVersion: '$version'/' contrib/charts/gubernator/Chart.yaml

go.mod

@@ -19,10 +19,10 @@ require (
 	go.etcd.io/etcd/client/v3 v3.5.5
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0
 	go.opentelemetry.io/otel v1.16.0
+	go.opentelemetry.io/otel/sdk v1.16.0
 	go.opentelemetry.io/otel/trace v1.16.0
 	golang.org/x/net v0.10.0
 	golang.org/x/time v0.3.0
-	google.golang.org/api v0.108.0
 	google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4
 	google.golang.org/grpc v1.55.0
 	google.golang.org/protobuf v1.30.0
@@ -33,8 +33,6 @@ require (
 )
 
 require (
-	cloud.google.com/go/compute v1.18.0 // indirect
-	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	github.com/armon/go-metrics v0.4.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
@@ -45,14 +43,10 @@ require (
 	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/btree v1.1.1 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.1 // indirect
-	github.com/googleapis/gax-go/v2 v2.7.0 // indirect
 	github.com/googleapis/gnostic v0.5.5 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
@@ -74,15 +68,13 @@ require (
 	github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.1 // indirect
 	go.etcd.io/etcd/api/v3 v3.5.5 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
-	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
 	go.opentelemetry.io/otel/exporters/jaeger v1.16.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 // indirect
 	go.opentelemetry.io/otel/metric v1.16.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.16.0 // indirect
 	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect

go.sum

@@ -26,12 +26,9 @@ cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUM
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
 cloud.google.com/go/compute v1.18.0 h1:FEigFqoDbys2cvFkZ9Fjq4gnHBP55anJ0yQyau2f9oY=
-cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs=
 cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
-cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
@@ -166,7 +163,6 @@ github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -234,13 +230,8 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.2.1 h1:RY7tHKZcRlk788d5WSo/e83gOyyy742E8GSs771ySpg=
-github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ=
-github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=
 github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU=
 github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw=
 github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA=
@@ -414,7 +405,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
@@ -440,8 +430,6 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
-go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 h1:ZOLJc06r4CB42laIXg/7udr0pbZyuAihN10A/XuiQRY=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0/go.mod h1:5z+/ZWJQKXa9YT34fQNx5K8Hd1EoIhvtUygUQPqEOgQ=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM=
@@ -768,8 +756,6 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q
 google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
 google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
 google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
-google.golang.org/api v0.108.0 h1:WVBc/faN0DkKtR43Q/7+tPny9ZoLZdIiAyG5Q9vFClg=
-google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=

tls_test.go

@@ -78,17 +78,17 @@ func TestSetupTLS(t *testing.T) {
 		{
 			name: "user provided certificates",
 			tls: &gubernator.TLSConfig{
-				CaFile:   "certs/ca.cert",
-				CertFile: "certs/gubernator.pem",
-				KeyFile:  "certs/gubernator.key",
+				CaFile:   "contrib/certs/ca.cert",
+				CertFile: "contrib/certs/gubernator.pem",
+				KeyFile:  "contrib/certs/gubernator.key",
 			},
 		},
 		{
 			name: "user provided certificate without IP SANs",
 			tls: &gubernator.TLSConfig{
-				CaFile:               "certs/ca.cert",
-				CertFile:             "certs/gubernator_no_ip_san.pem",
-				KeyFile:              "certs/gubernator_no_ip_san.key",
+				CaFile:               "contrib/certs/ca.cert",
+				CertFile:             "contrib/certs/gubernator_no_ip_san.pem",
+				KeyFile:              "contrib/certs/gubernator_no_ip_san.key",
 				ClientAuthServerName: "gubernator",
 			},
 		},
@@ -101,16 +101,16 @@ func TestSetupTLS(t *testing.T) {
 		{
 			name: "generate server certs with user provided ca",
 			tls: &gubernator.TLSConfig{
-				CaFile:    "certs/ca.cert",
-				CaKeyFile: "certs/ca.key",
+				CaFile:    "contrib/certs/ca.cert",
+				CaKeyFile: "contrib/certs/ca.key",
 				AutoTLS:   true,
 			},
 		},
 		{
 			name: "client auth enabled",
 			tls: &gubernator.TLSConfig{
-				CaFile:     "certs/ca.cert",
-				CaKeyFile:  "certs/ca.key",
+				CaFile:     "contrib/certs/ca.cert",
+				CaKeyFile:  "contrib/certs/ca.key",
 				AutoTLS:    true,
 				ClientAuth: tls.RequireAndVerifyClientCert,
 			},
@@ -158,9 +158,9 @@ func TestSetupTLSSkipVerify(t *testing.T) {
 		GRPCListenAddress: "127.0.0.1:9695",
 		HTTPListenAddress: "127.0.0.1:9685",
 		TLS: &gubernator.TLSConfig{
-			CaFile:   "certs/ca.cert",
-			CertFile: "certs/gubernator.pem",
-			KeyFile:  "certs/gubernator.key",
+			CaFile:   "contrib/certs/ca.cert",
+			CertFile: "contrib/certs/gubernator.pem",
+			KeyFile:  "contrib/certs/gubernator.key",
 		},
 	}
 
@@ -182,11 +182,11 @@ func TestSetupTLSSkipVerify(t *testing.T) {
 
 func TestSetupTLSClientAuth(t *testing.T) {
 	serverTLS := gubernator.TLSConfig{
-		CaFile:           "certs/ca.cert",
-		CertFile:         "certs/gubernator.pem",
-		KeyFile:          "certs/gubernator.key",
+		CaFile:           "contrib/certs/ca.cert",
+		CertFile:         "contrib/certs/gubernator.pem",
+		KeyFile:          "contrib/certs/gubernator.key",
 		ClientAuth:       tls.RequireAndVerifyClientCert,
-		ClientAuthCaFile: "certs/client-auth-ca.pem",
+		ClientAuthCaFile: "contrib/certs/client-auth-ca.pem",
 	}
 
 	conf := gubernator.DaemonConfig{
@@ -215,8 +215,8 @@ func TestSetupTLSClientAuth(t *testing.T) {
 
 	// Given the client auth certs
 	tls = &gubernator.TLSConfig{
-		CertFile:           "certs/client-auth.pem",
-		KeyFile:            "certs/client-auth.key",
+		CertFile:           "contrib/certs/client-auth.pem",
+		KeyFile:            "contrib/certs/client-auth.key",
 		InsecureSkipVerify: true,
 	}
 
@@ -231,9 +231,9 @@ func TestSetupTLSClientAuth(t *testing.T) {
 
 func TestTLSClusterWithClientAuthentication(t *testing.T) {
 	serverTLS := gubernator.TLSConfig{
-		CaFile:     "certs/ca.cert",
-		CertFile:   "certs/gubernator.pem",
-		KeyFile:    "certs/gubernator.key",
+		CaFile:     "contrib/certs/ca.cert",
+		CertFile:   "contrib/certs/gubernator.pem",
+		KeyFile:    "contrib/certs/gubernator.key",
 		ClientAuth: tls.RequireAndVerifyClientCert,
 	}
 
@@ -291,9 +291,9 @@ func TestHTTPSClientAuth(t *testing.T) {
 		HTTPListenAddress:       "127.0.0.1:9685",
 		HTTPStatusListenAddress: "127.0.0.1:9686",
 		TLS: &gubernator.TLSConfig{
-			CaFile:     "certs/ca.cert",
-			CertFile:   "certs/gubernator.pem",
-			KeyFile:    "certs/gubernator.key",
+			CaFile:     "contrib/certs/ca.cert",
+			CertFile:   "contrib/certs/gubernator.pem",
+			KeyFile:    "contrib/certs/gubernator.key",
 			ClientAuth: tls.RequireAndVerifyClientCert,
 		},
 	}

version

@@ -1 +1 @@
-v2.0.0-rc.50
+v2.0.0