Skip to content

Commit

Permalink
Update to go 1.21
Browse files Browse the repository at this point in the history
This change updates the version of Go being used from 1.19 > 1.21

Signed-off-by: Brendan Shephard <[email protected]>
  • Loading branch information
bshephar committed Feb 1, 2024
1 parent cd938c8 commit 54c203e
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: tools
namespace: openstack-k8s-operators
tag: ci-build-root-golang-1.19-sdk-1.31
tag: ci-build-root-golang-1.21-sdk-1.31
2 changes: 1 addition & 1 deletion .github/workflows/build-infra-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: openstack-k8s-operators/openstack-k8s-operators-ci/.github/workflows/reusable-build-operator.yaml@main
with:
operator_name: infra
go_version: 1.19.x
go_version: 1.21.x
operator_sdk_version: 1.31.0
secrets:
IMAGENAMESPACE: ${{ secrets.IMAGENAMESPACE }}
Expand Down
16 changes: 8 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GOLANG_BUILDER=golang:1.19
ARG GOLANG_BUILDER=golang:1.21
ARG OPERATOR_BASE_IMAGE=gcr.io/distroless/static:nonroot

# Build the manager binary
Expand Down Expand Up @@ -49,16 +49,16 @@ ARG IMAGE_TAGS="cn-openstack openstack"

# Labels required by upstream and osbs build system
LABEL com.redhat.component="${IMAGE_COMPONENT}" \
name="${IMAGE_NAME}" \
version="${IMAGE_VERSION}" \
summary="${IMAGE_SUMMARY}" \
io.k8s.name="${IMAGE_NAME}" \
io.k8s.description="${IMAGE_DESC}" \
io.openshift.tags="${IMAGE_TAGS}"
name="${IMAGE_NAME}" \
version="${IMAGE_VERSION}" \
summary="${IMAGE_SUMMARY}" \
io.k8s.name="${IMAGE_NAME}" \
io.k8s.description="${IMAGE_DESC}" \
io.openshift.tags="${IMAGE_TAGS}"
### DO NOT EDIT LINES ABOVE

ENV USER_UID=$USER_ID \
OPERATOR_TEMPLATES=/usr/share/infra-operator/templates/
OPERATOR_TEMPLATES=/usr/share/infra-operator/templates/

WORKDIR /

Expand Down
2 changes: 0 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ module github.com/openstack-k8s-operators/infra-operator

go 1.21

toolchain go1.21.1

require (
github.com/go-logr/logr v1.4.1
github.com/google/uuid v1.5.0
Expand Down
51 changes: 32 additions & 19 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,34 @@
{
"extends": [
"github>openstack-k8s-operators/renovate-config:default.json5"
],
"constraints": {
"go": "1.19"
},
"baseBranches": ["main"],
"useBaseBranchConfig": "merge",
"packageRules": [
{
"matchPackageNames": ["github.com/openstack-k8s-operators/infra-operator/apis"],
"enabled": false
}
],
"postUpgradeTasks": {
"commands": ["make gowork", "make tidy", "make manifests generate"],
"fileFilters": ["**/go.mod", "**/go.sum", "**/*.go", "**/*.yaml"],
"executionMode": "update"
}
"extends": [
"github>openstack-k8s-operators/renovate-config:default.json5"
],
"constraints": {
"go": "1.21"
},
"baseBranches": [
"main"
],
"useBaseBranchConfig": "merge",
"packageRules": [
{
"matchPackageNames": [
"github.com/openstack-k8s-operators/infra-operator/apis"
],
"enabled": false
}
],
"postUpgradeTasks": {
"commands": [
"make gowork",
"make tidy",
"make manifests generate"
],
"fileFilters": [
"**/go.mod",
"**/go.sum",
"**/*.go",
"**/*.yaml"
],
"executionMode": "update"
}
}

0 comments on commit 54c203e

Please sign in to comment.