Skip to content

Commit

Permalink
housekeeping: upgrade components
Browse files Browse the repository at this point in the history 
- docker template 3rd party dependencies
- go version
- go dependencies
- expected package min versions
  • Loading branch information
@ChristianGottinger
ChristianGottinger committed Apr 16, 2024
1 parent 69ec780 commit b41edc3
Show file tree
Hide file tree
Showing 4 changed files with 111 additions and 474 deletions.
23 changes: 13 additions & 10 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21.4-bullseye
FROM golang:1.22.2-bullseye

RUN apt-get update && \
apt-get install lsb-release unzip -y
Expand All @@ -8,15 +8,18 @@ RUN go version
RUN apt-get update

################## Tooling prerequisites ######################
ARG AZURE_CLI_VERSION=2.56.0
# Azure Cli
# https://github.com/Azure/azure-cli/releases
ARG AZURE_CLI_VERSION=2.59.0
RUN echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list && \
curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \
apt-get install apt-transport-https && \
apt-get update && apt-get install -y azure-cli=${AZURE_CLI_VERSION}-1~bullseye && \
az version

# terraform
ARG TERRAFORM_VERSION=1.6.3
# https://releases.hashicorp.com/terraform/
ARG TERRAFORM_VERSION=1.7.5
RUN curl -L https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip --output terraform.zip && \
unzip terraform.zip && \
mv terraform /usr/local/bin && \
Expand All @@ -25,14 +28,14 @@ RUN curl -L https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraf
# k8s CLI
# You must use a kubectl version that is within one minor version difference of your cluster.
# For example, a v1.24 client can communicate with v1.23, v1.24, and v1.25 control planes.
ARG KUBECTL_VERSION=v1.27.7
ARG KUBECTL_VERSION=v1.28.5
RUN curl -LO https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl && \
install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl && \
kubectl version --client=true -o=json

# kubelogin CLI
ARG KUBELOGIN_VERSION=v0.1.0
ARG KUBELOGIN_SHA256=be6247bed2a901b986c7edf2b106618480eb60aa3a47708149f0c62e58ebbab9
ARG KUBELOGIN_VERSION=v0.1.1
ARG KUBELOGIN_SHA256=51938ead06738bce6bb8fa4418fe043a5106a7d8bad037a65b57170c4f3fba0e
RUN curl -LO https://github.com/Azure/kubelogin/releases/download/${KUBELOGIN_VERSION}/kubelogin-linux-amd64.zip && \
echo "${KUBELOGIN_SHA256} kubelogin-linux-amd64.zip" | sha256sum -c && \
unzip kubelogin-linux-amd64.zip -d kubelogin && \
Expand All @@ -41,16 +44,16 @@ RUN curl -LO https://github.com/Azure/kubelogin/releases/download/${KUBELOGIN_VE
kubelogin --version

# helm
ARG HELM_VERSION=3.13.2
ARG HELM_VERSION=3.14.4
RUN curl -L https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz --output helm.tar.gz && \
tar xvzf helm.tar.gz && \
mv linux-amd64/helm /usr/local/bin && \
helm version

# copsctl
ARG COPSCTL_VERSION=0.12.1
RUN curl -LO https://github.com/conplementAG/copsctl/releases/download/v${COPSCTL_VERSION}/copsctl_${COPSCTL_VERSION}_Linux_x86_64.tar.gz && \
tar xvzf copsctl_${COPSCTL_VERSION}_Linux_x86_64.tar.gz && \
ARG COPSCTL_VERSION=0.12.3
RUN curl -LO https://github.com/conplementAG/copsctl/releases/download/v${COPSCTL_VERSION}/copsctl_Linux_x86_64.tar.gz && \
tar xvzf copsctl_Linux_x86_64.tar.gz && \
mv copsctl $GOPATH/bin && \
copsctl --version

Expand Down
47 changes: 26 additions & 21 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,48 +1,53 @@
module github.com/conplementag/cops-hq/v2

go 1.21
go 1.22

require (
github.com/Masterminds/semver/v3 v3.2.1
github.com/ahmetb/go-linq/v3 v3.2.0
github.com/avast/retry-go/v4 v4.5.1
github.com/briandowns/spinner v1.23.0
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be
github.com/google/uuid v1.3.1
github.com/google/uuid v1.6.0
github.com/mattn/go-colorable v0.1.13
github.com/sirupsen/logrus v1.9.3
github.com/snowzach/rotatefilehook v0.0.0-20220211133110-53752135082d
github.com/spf13/cobra v1.7.0
github.com/spf13/viper v1.16.0
github.com/stretchr/testify v1.8.4
github.com/spf13/cobra v1.8.0
github.com/spf13/viper v1.18.2
github.com/stretchr/testify v1.9.0
github.com/x-cray/logrus-prefixed-formatter v0.5.2
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/onsi/gomega v1.19.0 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/onsi/gomega v1.32.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
)
Loading

0 comments on commit b41edc3

Please sign in to comment.