Merge pull request #98 from annismckenzie/upgrade-dependencies

Upgrade dependencies

.github/workflows/build-push-image.yml

@@ -9,7 +9,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
       -
         name: Prepare
         id: prep
@@ -35,7 +35,7 @@ jobs:
         uses: docker/setup-qemu-action@v1
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v1.3.0
       -
         name: Cache Docker layers
         uses: actions/cache@v2.1.5
@@ -46,14 +46,14 @@ jobs:
             ${{ runner.os }}-buildx-
       -
         name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v1.9.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.CR_PAT }}
       -
         name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v2.4.0
         with:
           context: .
           file: ./Dockerfile

.github/workflows/go-tests.yml

@@ -11,7 +11,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.14.x, 1.15.x, 1.16.x]
+        go-version: [1.16.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -20,7 +20,7 @@ jobs:
       with:
         go-version: ${{ matrix.go-version }}
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v2.3.4
     - name: Download envtest dependencies
       uses: teddyking/dependency-action@v2.0.0
       with:
@@ -39,6 +39,6 @@ jobs:
       env:
         KUBEBUILDER_ASSETS: /home/runner/work/_temp/_github_home/kubebuilder/bin
     - name: Send coverage
-      uses: shogo82148/actions-goveralls@v1
+      uses: shogo82148/actions-goveralls@v1.4.4
       with:
         path-to-profile: profile.cov

.github/workflows/golangci-lint.yml

@@ -12,7 +12,7 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2.5.2
         with:

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1-experimental
 
-FROM --platform=${BUILDPLATFORM} golang:1.16.4-alpine AS base
+FROM --platform=${BUILDPLATFORM} golang:1.16.6-alpine AS base
 
 WORKDIR /workspace
 ENV CGO_ENABLED=0

Dockerfile.dev

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1-experimental
 
-FROM --platform=${BUILDPLATFORM} golang:1.16.4-alpine AS base
+FROM --platform=${BUILDPLATFORM} golang:1.16.6-alpine AS base
 
 WORKDIR /workspace
 ENV CGO_ENABLED=0

controllers/config/suite_test.go

@@ -98,16 +98,11 @@ var _ = BeforeSuite(func(done Done) {
 	err = os.Setenv("NAMESPACE", k3OSConfigNamespaceName)
 	Expect(err).ToNot(HaveOccurred())
 
-	customAPIServerFlags := []string{
-		"--enable-admission-plugins=PodSecurityPolicy",
-	}
-	apiServerFlags := append(envtest.DefaultKubeAPIServerFlags, customAPIServerFlags...)
-
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:  []string{filepath.Join("..", "..", "config", "crd", "bases")},
-		KubeAPIServerFlags: apiServerFlags,
+		CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")},
 	}
+	testEnv.ControlPlane.GetAPIServer().Configure().Append("enable-admission-plugins", "PodSecurityPolicy")
 
 	cfg, err = testEnv.Start()
 	Expect(err).ToNot(HaveOccurred())

go.mod

@@ -1,18 +1,21 @@
 module github.com/annismckenzie/k3os-config-operator
 
-go 1.15
+go 1.16
 
 require (
 	github.com/go-logr/logr v0.4.0
 	github.com/jessevdk/go-flags v1.5.0
-	github.com/onsi/ginkgo v1.16.2
-	github.com/onsi/gomega v1.13.0
-	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
-	k8s.io/api v0.20.5
-	k8s.io/apimachinery v0.20.5
-	k8s.io/client-go v0.20.5
-	sigs.k8s.io/cluster-api v0.3.11-0.20210115191551-61dc332270dc // uses master, added to use testing helpers
-	sigs.k8s.io/controller-runtime v0.8.3
+	github.com/onsi/ginkgo v1.16.4
+	github.com/onsi/gomega v1.14.0
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
+	k8s.io/api v0.21.3
+	k8s.io/apimachinery v0.21.3
+	k8s.io/client-go v0.21.3
+	sigs.k8s.io/cluster-api v0.4.0 // indirect; uses master, added to use testing helpers
+	sigs.k8s.io/cluster-api/test v0.4.0
+	sigs.k8s.io/controller-runtime v0.9.5
 )
 
+replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.0
+
 // replace sigs.k8s.io/controller-runtime => ../../../sigs.k8s.io/controller-runtime