Skip to content

Commit

Permalink
update dependencies and go version (#19)
Browse files Browse the repository at this point in the history
  • Loading branch information
dergeberl authored Jul 16, 2021
1 parent d9bde2e commit c838ba3
Show file tree
Hide file tree
Showing 6 changed files with 223 additions and 144 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: actions/setup-go@v1
with:
go-version: 1.15
go-version: 1.16
- uses: actions/checkout@v2
- name: run-generate
run: |
Expand All @@ -32,7 +32,7 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@v2
with:
version: v1.40
version: v1.41
test:
name: tests
runs-on: ubuntu-latest
Expand Down Expand Up @@ -78,9 +78,9 @@ jobs:
push: false
tags: local-kind-test:test
- name: Create k8s Kind Cluster
uses: helm/kind-action@v1.1.0
uses: helm/kind-action@v1.2.0
with:
version: v0.10.0
version: v0.11.1
cluster_name: kind
- name: Deploy kubeteach to kind cluster
run: |
Expand Down Expand Up @@ -113,9 +113,9 @@ jobs:
push: false
tags: local-kind-test:test
- name: Create k8s Kind Cluster
uses: helm/kind-action@v1.1.0
uses: helm/kind-action@v1.2.0
with:
version: v0.10.0
version: v0.11.1
cluster_name: kind
- name: Deploy kubeteach and exerciseset1 to kind cluster
run: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.15 as builder
FROM golang:1.16 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
4 changes: 2 additions & 2 deletions controllers/condition/condition.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func (c *Checks) runResourceCondition(

switch resourceCondition.Operator {
case "gt":
checkValue, err := strconv.ParseInt(resourceCondition.Value, 10, 0)
checkValue, err := strconv.ParseInt(resourceCondition.Value, 10, 0) //nolint: gomnd
if err != nil {
return false, err
}
Expand All @@ -137,7 +137,7 @@ func (c *Checks) runResourceCondition(
return true, nil
}
case "lt":
checkValue, err := strconv.ParseInt(resourceCondition.Value, 10, 0)
checkValue, err := strconv.ParseInt(resourceCondition.Value, 10, 0) //nolint: gomnd
if err != nil {
return false, err
}
Expand Down
12 changes: 6 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module github.com/dergeberl/kubeteach

go 1.15
go 1.16

require (
github.com/go-logr/logr v0.3.0
github.com/onsi/ginkgo v1.14.1
github.com/onsi/gomega v1.10.2
github.com/tidwall/gjson v1.8.0
k8s.io/api v0.19.2
k8s.io/apimachinery v0.19.2
k8s.io/client-go v0.19.2
sigs.k8s.io/controller-runtime v0.7.2
github.com/tidwall/gjson v1.8.1
k8s.io/api v0.20.2
k8s.io/apimachinery v0.20.2
k8s.io/client-go v0.20.2
sigs.k8s.io/controller-runtime v0.8.3
)
Loading

0 comments on commit c838ba3

Please sign in to comment.