Update go version to 1.23 and remove unused modules

Base, k8s, kaws and local modules were removed

Author: Twsouza

.circleci/config.yml

@@ -117,7 +117,7 @@ jobs:
         type: string
         default: ""
     docker:
-      - image: cimg/go:1.18.0
+      - image: cimg/go:1.23.0
     environment:
       PROVIDER: <<parameters.provider>>
       ARGS: <<parameters.args>>
@@ -136,14 +136,14 @@ jobs:
           when: always
   cleanup:
     docker:
-      - image: cimg/go:1.18.0
+      - image: cimg/go:1.23.0
     steps:
       - checkout
       - ci-dependencies
       - run: scripts/ci-cleanup
   cleanup_all:
     docker:
-      - image: cimg/go:1.18.0
+      - image: cimg/go:1.23.0
     steps:
       - checkout
       - ci-dependencies
@@ -157,14 +157,14 @@ jobs:
       repo:
         type: string
     docker:
-      - image: cimg/go:1.18.0
+      - image: cimg/go:1.23.0
     steps:
       - checkout
       - ci-dependencies
       - run: ci/deploy.sh <<parameters.repo>> <<parameters.app>> <<parameters.check>>
   test:
     docker:
-      - image: cimg/go:1.18.0
+      - image: cimg/go:1.23.0
     # working_directory: /go/src/github.com/convox/rack
     steps:
       - checkout
@@ -176,7 +176,7 @@ jobs:
       - run: curl -s https://codecov.io/bash | bash
   update:
     docker:
-      - image: cimg/go:1.18.0
+      - image: cimg/go:1.23.0
     steps:
       - checkout
       - ci-dependencies

.github/workflows/publish.yml

@@ -15,10 +15,8 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: golang-1.18
+      - name: golang-1.23
         uses: actions/setup-go@v3
-        with:
-          go-version: '1.18.10'
       - name: version
         run: echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
       - name: secrets

.github/workflows/release.yml

@@ -13,10 +13,8 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: golang-1.18
+      - name: golang-1.23
         uses: actions/setup-go@v3
-        with:
-          go-version: '1.18.10'
       - name: go path
         run: |
           mkdir -p ${HOME}/go

Dockerfile

@@ -1,61 +1,15 @@
-## test ########################################################################
-
-FROM golang:1.18 AS test
-
-ARG DOCKER_ARCH=x86_64
-ARG KUBECTL_ARCH=amd64
-
-RUN curl -s https://download.docker.com/linux/static/stable/${DOCKER_ARCH}/docker-18.09.9.tgz | \
-    tar -C /usr/bin --strip-components 1 -xz
-
-RUN curl -Ls https://storage.googleapis.com/kubernetes-release/release/v1.13.0/bin/linux/${KUBECTL_ARCH}/kubectl -o /usr/bin/kubectl && \
-    chmod +x /usr/bin/kubectl
-
-RUN curl -Ls https://github.com/mattgreen/watchexec/releases/download/1.8.6/watchexec-1.8.6-x86_64-unknown-linux-gnu.tar.gz | \
-    tar -C /usr/bin --strip-components 1 -xz
-
-WORKDIR /go/src/github.com/convox/rack
-
-COPY . .
-
-RUN go build -mod=vendor --ldflags="-s -w" $(go list -mod=vendor ./vendor/...)
-
-
-## development #################################################################
-
-FROM test AS development
-
-# RUN curl -s https://download.docker.com/linux/static/stable/x86_64/docker-18.09.6.tgz | \
-#     tar -C /usr/bin --strip-components 1 -xz
-
-# RUN curl -Ls https://storage.googleapis.com/kubernetes-release/release/v1.13.0/bin/linux/amd64/kubectl -o /usr/bin/kubectl && \
-#     chmod +x /usr/bin/kubectl
-
-# RUN curl -Ls https://github.com/mattgreen/watchexec/releases/download/1.8.6/watchexec-1.8.6-x86_64-unknown-linux-gnu.tar.gz | \
-#     tar -C /usr/bin --strip-components 1 -xz
-
-ENV DEVELOPMENT=true
-
-# WORKDIR /go/src/github.com/convox/rack
-
-# COPY vendor vendor
-# RUN go install --ldflags="-s -w" ./vendor/...
-
-# COPY . .
-RUN make build
-
-CMD ["bin/web"]
-
 ## package #####################################################################
 
-FROM golang:1.18 AS package
+FROM golang:1.23-bookworm AS package
 
-RUN apt-get update && apt-get -y install upx-ucl
+# Add backports to get upx-ucl in Bookworm
+RUN echo "deb http://deb.debian.org/debian bookworm-backports main" > /etc/apt/sources.list.d/backports.list && \
+    apt-get update && apt-get install -y -t bookworm-backports upx-ucl
 
 WORKDIR /go/src/github.com/convox/rack
 
-COPY --from=development /go/src/github.com/convox/rack .
-RUN make package build compress
+COPY . /go/src/github.com/convox/rack
+RUN make build compress
 
 ## production ##################################################################
 
@@ -81,15 +35,13 @@ ENV PATH=$PATH:/go/bin
 
 WORKDIR /rack
 
-COPY --from=package /go/bin/atom /go/bin/
 COPY --from=package /go/bin/build /go/bin/
 COPY --from=package /go/bin/convox-env /go/bin/
 COPY --from=package /go/bin/monitor /go/bin/
 COPY --from=package /go/bin/rack /go/bin/
-COPY --from=package /go/bin/router /go/bin/
 
 # aws templates
-COPY --from=development /go/src/github.com/convox/rack/provider/aws/formation/ provider/aws/formation/
-COPY --from=development /go/src/github.com/convox/rack/provider/aws/templates/ provider/aws/templates/
+COPY --from=package /go/src/github.com/convox/rack/provider/aws/formation/ provider/aws/formation/
+COPY --from=package /go/src/github.com/convox/rack/provider/aws/templates/ provider/aws/templates/
 
 CMD ["/go/bin/rack"]

Dockerfile.arm

@@ -1,8 +1,10 @@
 ## package #####################################################################
 
-FROM golang:1.18 AS package
+FROM golang:1.23 AS package
 
-RUN apt-get update && apt-get -y install upx-ucl
+# Add backports to get upx-ucl in Bookworm
+RUN echo "deb http://deb.debian.org/debian bookworm-backports main" > /etc/apt/sources.list.d/backports.list && \
+    apt-get update && apt-get install -y -t bookworm-backports upx-ucl
 
 WORKDIR /go/src/github.com/convox/rack
 
@@ -30,12 +32,10 @@ ENV PATH=$PATH:/go/bin
 
 WORKDIR /rack
 
-COPY --from=package /go/bin/atom /go/bin/
 COPY --from=package /go/bin/build /go/bin/
 COPY --from=package /go/bin/convox-env /go/bin/
 COPY --from=package /go/bin/monitor /go/bin/
 COPY --from=package /go/bin/rack /go/bin/
-COPY --from=package /go/bin/router /go/bin/
 
 # aws templates
 COPY --from=package /go/src/github.com/convox/rack/provider/aws/formation/ provider/aws/formation/

Makefile

@@ -1,11 +1,8 @@
 .PHONY: all build builder clean clean-package compress dev generate mocks package release release-cli release-image release-provider release-version version-gen test test-docker
 
-commands = atom build monitor rack router
+commands = build monitor rack
 injects  = convox-env
 
-# commands = build rack router
-# injects  =
-
 assets   = $(wildcard assets/*)
 binaries = $(addprefix $(GOPATH)/bin/, $(commands))
 sources  = $(shell find . -name '*.go')
@@ -55,9 +52,6 @@ generate:
 	go run cmd/generate/main.go controllers > pkg/api/controllers.go
 	go run cmd/generate/main.go routes > pkg/api/routes.go
 	go run cmd/generate/main.go sdk > sdk/methods.go
-	make -C pkg/atom generate
-	make -C provider/k8s generate
-	make -C provider/kaws generate
 
 generate-provider:
 	go run cmd/generate/main.go controllers > pkg/api/controllers.go

cmd/atom/main.go

@@ -1,4 +1,4 @@
-FROM golang:1.18
+FROM golang:1.23
 
 RUN curl -s https://download.docker.com/linux/static/stable/x86_64/docker-18.03.1-ce.tgz | \
     tar -C /usr/bin --strip-components 1 -xz

cmd/build/Dockerfile

@@ -21,7 +21,7 @@ package:
 
 	go install github.com/crazy-max/xgo@v0.7.5
 	if [ -f /.dockerenv ]; then tar cz $(GOPATH) | docker run -v $(GOPATH):/gopath -i ubuntu tar xz -C /gopath --strip-components 2; fi
-	cd ../.. && $(GOPATH)/bin/xgo -branch $(shell git rev-parse HEAD) -pkg cmd/convox -out cmd/convox/pkg/convox -go 1.18.x -targets 'darwin/amd64' -ldflags "-X main.version=$(VERSION)" .
+	cd ../.. && $(GOPATH)/bin/xgo -branch $(shell git rev-parse HEAD) -pkg cmd/convox -out cmd/convox/pkg/convox -go 1.23.x -targets 'darwin/amd64' -ldflags "-X main.version=$(VERSION)" .
 	if [ -f /.dockerenv ]; then mkdir -p pkg && docker run -v $(GOPATH):/gopath -i ubuntu tar czv /gopath/src/github.com/convox/rack/cmd/convox/pkg | tar xzv -C pkg --strip-components 8; fi
 
 release: package