kcp-ci-bot · Oct 8, 2023 · Oct 7, 2023 · Sep 17, 2023 · Oct 7, 2023 · Sep 17, 2023
diff --git a/.github/workflows/docs-gen-and-push.yaml b/.github/workflows/docs-gen-and-push.yaml
@@ -33,7 +33,7 @@ jobs:
 
       - uses: actions/setup-go@v4
         with:
-          go-version: v1.19
+          go-version: v1.20
           cache: true
 
       - uses: actions/setup-python@v4

diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
@@ -22,7 +22,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-go@v4
       with:
-        go-version: v1.19
+        go-version: v1.20
     - name: Delete non-semver tags
       run: 'git tag -d $(git tag -l | grep -v "^v")'
     - name: Set LDFLAGS

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -10,7 +10,6 @@ linters:
   - bidichk
   - bodyclose
   - containedctx
-  - depguard
   - dupword
   - durationcheck
   - errcheck

diff --git a/.prow.yaml b/.prow.yaml
@@ -7,7 +7,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.19.9-2
+        - image: ghcr.io/kcp-dev/infra/build:1.20.8-1
           command:
             - make
             - verify-boilerplate
@@ -27,7 +27,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.19.9-2
+        - image: ghcr.io/kcp-dev/infra/build:1.20.8-1
           command:
             - make
             - verify-codegen
@@ -44,7 +44,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.19.9-2
+        - image: ghcr.io/kcp-dev/infra/build:1.20.8-1
           command:
             - make
             - lint
@@ -83,7 +83,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.19.9-2
+        - image: ghcr.io/kcp-dev/infra/build:1.20.8-1
           command:
             - make
             - test
@@ -103,7 +103,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.19.9-2
+        - image: ghcr.io/kcp-dev/infra/build:1.20.8-1
           command:
             - ./hack/run-with-prometheus.sh
             - make
@@ -130,7 +130,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.19.9-2
+        - image: ghcr.io/kcp-dev/infra/build:1.20.8-1
           command:
             - ./hack/run-with-prometheus.sh
             - make
@@ -159,7 +159,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.19.9-2
+        - image: ghcr.io/kcp-dev/infra/build:1.20.8-1
           command:
             - ./hack/run-with-prometheus.sh
             - make
@@ -184,7 +184,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.19.9-2
+        - image: ghcr.io/kcp-dev/infra/build:1.20.8-1
           command:
             - ./hack/run-with-prometheus.sh
             - make

diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Build the binary
-FROM --platform=${BUILDPLATFORM} docker.io/golang:1.19 AS builder
+FROM --platform=${BUILDPLATFORM} docker.io/golang:1.20 AS builder
 WORKDIR /workspace
 
 # Install dependencies.

diff --git a/Makefile b/Makefile
@@ -54,19 +54,19 @@ OPENSHIFT_GOIMPORTS_BIN := openshift-goimports
 OPENSHIFT_GOIMPORTS := $(TOOLS_DIR)/$(OPENSHIFT_GOIMPORTS_BIN)-$(OPENSHIFT_GOIMPORTS_VER)
 export OPENSHIFT_GOIMPORTS # so hack scripts can use it
 
-GOLANGCI_LINT_VER := v1.50.1
+GOLANGCI_LINT_VER := v1.54.2
 GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(TOOLS_GOBIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
 
-STATICCHECK_VER := 2022.1
+STATICCHECK_VER := 2023.1
 STATICCHECK_BIN := staticcheck
 STATICCHECK := $(TOOLS_GOBIN_DIR)/$(STATICCHECK_BIN)-$(STATICCHECK_VER)
 
 GOTESTSUM_VER := v1.8.1
 GOTESTSUM_BIN := gotestsum
 GOTESTSUM := $(abspath $(TOOLS_DIR))/$(GOTESTSUM_BIN)-$(GOTESTSUM_VER)
 
-LOGCHECK_VER := v0.4.0
+LOGCHECK_VER := v0.7.0
 LOGCHECK_BIN := logcheck
 LOGCHECK := $(TOOLS_GOBIN_DIR)/$(LOGCHECK_BIN)-$(LOGCHECK_VER)
 export LOGCHECK # so hack scripts can use it
@@ -141,7 +141,7 @@ $(CODE_GENERATOR):
 	GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) github.com/kcp-dev/code-generator/v2 $(CODE_GENERATOR_BIN) $(CODE_GENERATOR_VER)
 
 lint: $(GOLANGCI_LINT) $(STATICCHECK) $(LOGCHECK) ## Verify lint
-	$(GOLANGCI_LINT) run ./...
+	$(GOLANGCI_LINT) run --timeout 10m ./...
 	$(STATICCHECK) -checks ST1019,ST1005 ./...
 	./hack/verify-contextual-logging.sh
 .PHONY: lint

diff --git a/cmd/cache-server/main.go b/cmd/cache-server/main.go
@@ -18,10 +18,8 @@ package main
 
 import (
 	"flag"
-	"math/rand"
 	"os"
 	"strings"
-	"time"
 
 	"github.com/spf13/cobra"
 
@@ -36,8 +34,6 @@ import (
 )
 
 func main() {
-	rand.Seed(time.Now().UTC().UnixNano())
-
 	rootDir := flag.String("root-directory", ".kcp-cache", "Path to the root directory where all files required by this server will be stored")
 
 	var cacheServerFlags, remainingFlags []string //nolint:prealloc

diff --git a/cmd/kcp-core/kcpcore.go b/cmd/kcp-core/kcpcore.go
@@ -18,10 +18,8 @@ package main
 
 import (
 	"fmt"
-	"math/rand"
 	"os"
 	"strings"
-	"time"
 
 	"github.com/spf13/cobra"
 
@@ -46,8 +44,6 @@ import (
 )
 
 func main() {
-	rand.Seed(time.Now().UTC().UnixNano())
-
 	cmd := &cobra.Command{
 		Use:   "kcp-core",
 		Short: "kcp control plane core",

diff --git a/cmd/kcp-front-proxy/main.go b/cmd/kcp-front-proxy/main.go
@@ -19,10 +19,8 @@ package main
 import (
 	"context"
 	goflags "flag"
-	"math/rand"
 	"net/http"
 	"os"
-	"time"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -43,8 +41,6 @@ import (
 func main() {
 	ctx := genericapiserver.SetupSignalContext()
 
-	rand.Seed(time.Now().UTC().UnixNano())
-
 	pflag.CommandLine.SetNormalizeFunc(utilflag.WordSepNormalizeFunc)
 	pflag.CommandLine.AddGoFlagSet(goflags.CommandLine)
 

diff --git a/cmd/kcp/kcp.go b/cmd/kcp/kcp.go
@@ -18,10 +18,8 @@ package main
 
 import (
 	"fmt"
-	"math/rand"
 	"os"
 	"strings"
-	"time"
 
 	"github.com/spf13/cobra"
 
@@ -46,8 +44,6 @@ import (
 )
 
 func main() {
-	rand.Seed(time.Now().UTC().UnixNano())
-
 	cmd := &cobra.Command{
 		Use:   "kcp",
 		Short: "Kube for Control Plane (KCP)",

diff --git a/cmd/sharded-test-server/virtual.go b/cmd/sharded-test-server/virtual.go
@@ -235,7 +235,7 @@ func (v *VirtualWorkspace) waitForReady(ctx context.Context) (<-chan error, erro
 	vwHost := fmt.Sprintf("https://%s", net.JoinHostPort("localhost", virtualWorkspacePort(v.index)))
 	kubeconfigPath := filepath.Join(v.workDirPath, fmt.Sprintf(".kcp-virtual-workspaces-%d/virtualworkspace.kubeconfig", v.index))
 
-	if err := wait.PollImmediateInfiniteWithContext(ctx, time.Millisecond*500, func(ctx context.Context) (bool, error) {
+	if err := wait.PollUntilContextCancel(ctx, time.Millisecond*500, true, func(ctx context.Context) (bool, error) {
 		select {
 		case <-ctx.Done():
 			return false, fmt.Errorf("context canceled")

diff --git a/cmd/virtual-workspaces/command/cmd.go b/cmd/virtual-workspaces/command/cmd.go
@@ -118,7 +118,7 @@ func Run(ctx context.Context, o *options.Options) error {
 
 	// resolve identities for system APIBindings
 	identityConfig, resolveIdentities := bootstrap.NewConfigWithWildcardIdentities(nonIdentityConfig, bootstrap.KcpRootGroupExportNames, bootstrap.KcpRootGroupResourceExportNames, localShardKubeClusterClient)
-	if err := wait.PollImmediateInfiniteWithContext(ctx, time.Millisecond*500, func(ctx context.Context) (bool, error) {
+	if err := wait.PollUntilContextCancel(ctx, time.Millisecond*500, true, func(ctx context.Context) (bool, error) {
 		if err := resolveIdentities(ctx); err != nil {
 			logger.V(3).Info("failed to resolve identities, keeping trying: ", "err", err)
 			return false, nil

diff --git a/cmd/virtual-workspaces/main.go b/cmd/virtual-workspaces/main.go
@@ -19,9 +19,7 @@ package main
 import (
 	goflag "flag"
 	"fmt"
-	"math/rand"
 	"os"
-	"time"
 
 	"github.com/spf13/pflag"
 
@@ -33,8 +31,6 @@ import (
 func main() {
 	ctx := genericapiserver.SetupSignalContext()
 
-	rand.Seed(time.Now().UTC().UnixNano())
-
 	pflag.CommandLine.AddGoFlagSet(goflag.CommandLine)
 
 	command := virtualworkspacecommand.NewCommand(ctx, os.Stderr)

diff --git a/config/crds/bootstrap.go b/config/crds/bootstrap.go
@@ -168,7 +168,7 @@ func CreateSingle(ctx context.Context, client apiextensionsv1client.CustomResour
 
 	logger.Info("waiting for CRD to be established")
 	var lastMsg string
-	return wait.PollImmediateInfiniteWithContext(ctx, 100*time.Millisecond, func(ctx context.Context) (bool, error) {
+	return wait.PollUntilContextCancel(ctx, 100*time.Millisecond, true, func(ctx context.Context) (bool, error) {
 		crd, err := client.Get(ctx, rawCRD.Name, metav1.GetOptions{})
 		if err != nil {
 			if apierrors.IsNotFound(err) {

diff --git a/config/helpers/bootstrap.go b/config/helpers/bootstrap.go
@@ -86,7 +86,7 @@ func Bootstrap(ctx context.Context, discoveryClient discovery.DiscoveryInterface
 	for _, opt := range opts {
 		transformers = append(transformers, opt.TransformFile)
 	}
-	return wait.PollImmediateInfiniteWithContext(ctx, time.Second, func(ctx context.Context) (bool, error) {
+	return wait.PollUntilContextCancel(ctx, time.Second, true, func(ctx context.Context) (bool, error) {
 		if err := CreateResourcesFromFS(ctx, dynamicClient, mapper, batteriesIncluded, fs, transformers...); err != nil {
 			klog.FromContext(ctx).WithValues("err", err).Info("failed to bootstrap resources, retrying")
 			// invalidate cache if resources not found
@@ -266,7 +266,7 @@ func BindRootAPIs(ctx context.Context, kcpClient kcpclient.Interface, exportName
 			return err
 		}
 
-		if err := wait.PollImmediateInfiniteWithContext(ctx, time.Second, func(ctx context.Context) (bool, error) {
+		if err := wait.PollUntilContextCancel(ctx, time.Second, true, func(ctx context.Context) (bool, error) {
 			existing, err := kcpClient.ApisV1alpha1().APIBindings().Get(ctx, exportName, metav1.GetOptions{})
 			if err != nil {
 				logger.Error(err, "error getting APIBinding", "name", exportName)

diff --git a/config/root-phase0/bootstrap.go b/config/root-phase0/bootstrap.go
@@ -50,7 +50,7 @@ func Bootstrap(ctx context.Context, kcpClient kcpclient.Interface, rootDiscovery
 	}
 
 	// set LogicalCluster to Initializing
-	return wait.PollImmediateUntilWithContext(ctx, time.Millisecond*100, func(ctx context.Context) (done bool, err error) {
+	return wait.PollUntilContextCancel(ctx, time.Millisecond*100, true, func(ctx context.Context) (done bool, err error) {
 		logger := klog.FromContext(ctx).WithValues("bootstrapping", "root-phase0")
 		logicalCluster, err := kcpClient.CoreV1alpha1().LogicalClusters().Get(ctx, corev1alpha1.LogicalClusterName, metav1.GetOptions{})
 		if err != nil {

diff --git a/config/system-crds/bootstrap.go b/config/system-crds/bootstrap.go
@@ -58,7 +58,7 @@ func Bootstrap(ctx context.Context, crdClient apiextensionsclient.Interface, dis
 		{Group: apis.GroupName, Resource: "apiconversions"},
 	}
 
-	if err := wait.PollImmediateInfiniteWithContext(ctx, time.Second, func(ctx context.Context) (bool, error) {
+	if err := wait.PollUntilContextCancel(ctx, time.Second, true, func(ctx context.Context) (bool, error) {
 		if err := configcrds.Create(ctx, crdClient.ApiextensionsV1().CustomResourceDefinitions(), crds...); err != nil {
 			logger.Error(err, "failed to bootstrap system CRDs, retrying")
 			return false, nil // keep retrying

diff --git a/docs/content/CONTRIBUTING.md b/docs/content/CONTRIBUTING.md
@@ -17,7 +17,7 @@ contribution. See the [DCO](https://github.com/kcp-dev/kcp/tree/main/DCO) file f
 ### Prerequisites
 
 1. Clone this repository.
-2. [Install Go](https://golang.org/doc/install) (currently 1.19).
+2. [Install Go](https://golang.org/doc/install) (currently 1.20).
 3. Install [kubectl](https://kubernetes.io/docs/tasks/tools/#kubectl).
 
 Please note that the go language version numbers in these files must exactly agree: go/go.mod file, kcp/.ci-operator.yaml, kcp/Dockerfile, and in all the kcp/.github/workflows yaml files that specify go-version. In kcp/.ci-operator.yaml the go version is indicated by the "tag" attribute. In kcp/Dockerfile it is indicated by the "golang" attribute. In go.mod it is indicated by the "go" directive." In the .github/workflows yaml files it is indicated by "go-version"