chore(pkg): upgrade new require

Author: duanhongyi

Makefile

@@ -3,7 +3,7 @@
 # - Docker image name
 # - Kubernetes service, rc, pod, secret, volume names
 REPO_PATH := github.com/drycc/pkg
-DEV_ENV_IMAGE := drycc/go-dev
+DEV_ENV_IMAGE := ${DEV_REGISTRY}/drycc/go-dev
 DEV_ENV_WORK_DIR := /opt/drycc/go/src/${REPO_PATH}
 
 # Enable vendor/ directory support.
@@ -31,6 +31,6 @@ test: build test-style
 	${DEV_ENV_CMD} go test -race -cover -coverprofile=coverage.txt -covermode=atomic ${PKG_DIRS}
 
 test-style: bootstrap
-	${DEV_ENV_CMD} lint --deadline
+	${DEV_ENV_CMD} lint
 
 .PHONY: all build test

aboutme/aboutme.go

@@ -2,12 +2,12 @@
 //
 // Typical usage is to let the Pod auto-detect information about itself:
 //
-//	my, err := aboutme.FromEnv()
-//  if err != nil {
-// 		// Error connecting to tke k8s API server
-// 	}
+//		my, err := aboutme.FromEnv()
+//	 if err != nil {
+//			// Error connecting to tke k8s API server
+//		}
 //
-// 	fmt.Printf("My Pod Name is %s", my.Name)
+//		fmt.Printf("My Pod Name is %s", my.Name)
 package aboutme
 
 import (
@@ -102,7 +102,7 @@ func NameFromEnv() string {
 	return n
 }
 
-//NamespaceFromEnv attempts to get the namespace from the downward API.
+// NamespaceFromEnv attempts to get the namespace from the downward API.
 //
 // If EnvNamespace is not set, or if the name is not recovered from the
 // environment, then the DefaultNamespace is used.
@@ -119,9 +119,9 @@ func NamespaceFromEnv() string {
 // The properties of Me are placed into the environment according to the
 // following rules:
 //
-// 	- In general, all variables are prefaced with MY_ (MY_IP, MY_NAMESPACE)
-// 	- Labels become MY_LABEL_[NAME]=[value]
-// 	- Annotations become MY_ANNOTATION_[NAME] = [value]
+//   - In general, all variables are prefaced with MY_ (MY_IP, MY_NAMESPACE)
+//   - Labels become MY_LABEL_[NAME]=[value]
+//   - Annotations become MY_ANNOTATION_[NAME] = [value]
 func (me *Me) ShuntEnv() {
 	env := map[string]string{
 		"MY_APISERVER": me.APIServer,
@@ -180,13 +180,13 @@ func (me *Me) loadPod() (*v1.Pod, string, error) {
 	return p, ns, err
 }
 
-// findPodInNamespaces searches relevant namespaces for this pod.
+// FindPodInNamespaces searches relevant namespaces for this pod.
 //
 // It returns a PodInterface for working with the pod, a namespace name as a
 // string, and an error if something goes wrong.
 //
 // The selector must be a label selector.
-func (me *Me) findPodInNamespaces(selector string) (*v1.Pod, string, error) {
+func (me *Me) FindPodInNamespaces(selector string) (*v1.Pod, string, error) {
 	// Get the drycc namespace. If it does not exist, get the default namespce.
 	s, err := labels.Parse(selector)
 	if err == nil {

env/envvar.go

@@ -12,7 +12,7 @@ import (
 //
 // Parameters passed in are of the form varname => defaultValue.
 //
-// 	r.Route("foo", "example").Does(envvar.Get).Using("HOME").WithDefault(".")
+//	r.Route("foo", "example").Does(envvar.Get).Using("HOME").WithDefault(".")
 //
 // As with all environment variables, the default value must be a string.
 //
@@ -52,10 +52,10 @@ func Get(c cookoo.Context, params *cookoo.Params) (interface{}, cookoo.Interrupt
 // Expand expands the environment variables in the given string and returns the result.
 //
 // Params:
-// 	- content (string): The given string to expand.
+//   - content (string): The given string to expand.
 //
 // Returns:
-//  - The expanded string. This expands against the os environment (os.ExpandEnv).
+//   - The expanded string. This expands against the os environment (os.ExpandEnv).
 func Expand(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt) {
 	s := p.Get("content", "").(string)
 
@@ -77,10 +77,13 @@ func Expand(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt)
 // are retrieved from the underlying map.
 //
 // Params:
-//   accessed as map[string]string
+//
+//	accessed as map[string]string
+//
 // Returns:
-//   nothing, but inserts all name/value pairs into the context and the
-//   environment.
+//
+//	nothing, but inserts all name/value pairs into the context and the
+//	environment.
 func Set(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt) {
 	for name, def := range p.AsMap() {
 		// Assume Nil means unset the value.

go.mod

@@ -1,40 +1,50 @@
 module github.com/drycc/pkg
 
-go 1.18
+go 1.19
 
 require (
 	github.com/Masterminds/cookoo v1.3.0
 	github.com/stretchr/testify v1.8.0
-	k8s.io/api v0.22.0
-	k8s.io/apimachinery v0.22.0
-	k8s.io/client-go v0.22.0
+	k8s.io/api v0.25.0
+	k8s.io/apimachinery v0.25.0
+	k8s.io/client-go v0.25.0
 )
 
 require (
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-logr/logr v0.4.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.8.0 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/jsonreference v0.19.5 // indirect
+	github.com/go-openapi/swag v0.19.14 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/go-cmp v0.5.5 // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
-	github.com/googleapis/gnostic v0.5.5 // indirect
-	github.com/json-iterator/go v1.1.11 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/mailru/easyjson v0.7.6 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
-	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
-	golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
-	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
-	golang.org/x/text v0.3.6 // indirect
-	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
-	google.golang.org/appengine v1.6.5 // indirect
-	google.golang.org/protobuf v1.26.0 // indirect
+	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
+	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
+	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/klog/v2 v2.9.0 // indirect
-	k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
+	k8s.io/klog/v2 v2.70.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
+	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
+	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.2.0 // indirect
 )