pkg/util/k8sutil -> pkg/k8s, pkg/util/tlsutil -> pkg/tls

Author: estroz

commands/operator-sdk/cmd/up/local.go

@@ -30,9 +30,9 @@ import (
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 	ansibleOperator "github.com/operator-framework/operator-sdk/pkg/ansible/operator"
 	proxy "github.com/operator-framework/operator-sdk/pkg/ansible/proxy"
+	k8sutil "github.com/operator-framework/operator-sdk/pkg/k8s"
 	"github.com/operator-framework/operator-sdk/pkg/scaffold"
 	ansibleScaffold "github.com/operator-framework/operator-sdk/pkg/scaffold/ansible"
-	"github.com/operator-framework/operator-sdk/pkg/util/k8sutil"
 	sdkVersion "github.com/operator-framework/operator-sdk/version"
 
 	"github.com/sirupsen/logrus"

pkg/util/k8sutil/constants.go renamed to pkg/k8s/constants.go

@@ -44,7 +44,7 @@ import (
 	"{{ .Repo }}/pkg/apis"
 	"{{ .Repo }}/pkg/controller"
 
-	k8sutil "github.com/operator-framework/operator-sdk/pkg/util/k8sutil"
+	k8sutil "github.com/operator-framework/operator-sdk/pkg/k8s"
 	sdkVersion "github.com/operator-framework/operator-sdk/version"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"

pkg/util/k8sutil/k8sutil.go renamed to pkg/k8s/k8sutil.go

@@ -40,7 +40,7 @@ import (
 
 	"github.com/example-inc/app-operator/pkg/apis"
 	"github.com/example-inc/app-operator/pkg/controller"
-	k8sutil "github.com/operator-framework/operator-sdk/pkg/util/k8sutil"
+	k8sutil "github.com/operator-framework/operator-sdk/pkg/k8s"
 	sdkVersion "github.com/operator-framework/operator-sdk/version"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"

pkg/util/k8sutil/k8sutil_test.go renamed to pkg/k8s/k8sutil_test.go

@@ -19,7 +19,7 @@ import (
 	"net/http"
 	"strconv"
 
-	k8sutil "github.com/operator-framework/operator-sdk/pkg/util/k8sutil"
+	k8sutil "github.com/operator-framework/operator-sdk/pkg/k8s"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"

pkg/scaffold/cmd.go

@@ -87,7 +87,7 @@ func newSelfSignedCACertificate(key *rsa.PrivateKey) (*x509.Certificate, error)
 		NotAfter:              now.Add(duration365d).UTC(),
 		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
 		BasicConstraintsValid: true,
-		IsCA: true,
+		IsCA:                  true,
 	}
 	certDERBytes, err := x509.CreateCertificate(rand.Reader, &tmpl, &tmpl, key.Public(), key)
 	if err != nil {