diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32845fd0..9841809a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,12 +16,12 @@ concurrency: jobs: build: name: Build - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - - name: Set up Go 1.22 + - name: Set up Go 1.23 uses: actions/setup-go@v1 with: - go-version: '1.22' + go-version: '1.23' id: go - uses: actions/checkout@v2 @@ -40,7 +40,7 @@ jobs: kubernetes: name: Kubernetes - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: build strategy: matrix: diff --git a/.github/workflows/update-crds.yaml b/.github/workflows/update-crds.yaml index 8aa79ec5..39a5d9b0 100644 --- a/.github/workflows/update-crds.yaml +++ b/.github/workflows/update-crds.yaml @@ -8,12 +8,12 @@ on: jobs: build: name: Build - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - - name: Set up Go 1.22 + - name: Set up Go 1.23 uses: actions/setup-go@v1 with: - go-version: '1.22' + go-version: '1.23' id: go - uses: actions/checkout@v1 diff --git a/Makefile b/Makefile index 9ecf443c..3632860a 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH)) BASEIMAGE_PROD ?= gcr.io/distroless/static-debian12 BASEIMAGE_DBG ?= debian:bookworm -GO_VERSION ?= 1.22 +GO_VERSION ?= 1.23 BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION) OUTBIN = bin/$(OS)_$(ARCH)/$(BIN) diff --git a/apis/appcatalog/v1alpha1/appbinding_helpers.go b/apis/appcatalog/v1alpha1/appbinding_helpers.go index b24ead9e..c9af21a0 100644 --- a/apis/appcatalog/v1alpha1/appbinding_helpers.go +++ b/apis/appcatalog/v1alpha1/appbinding_helpers.go @@ -67,7 +67,7 @@ func (a AppBinding) URLTemplate() (string, error) { if i < 0 { return auth + rawurl, nil } - return fmt.Sprintf(rawurl[:i+3] + auth + rawurl[i+3:]), nil + return rawurl[:i+3] + auth + rawurl[i+3:], nil } func (a AppBinding) Host() (string, error) {