Skip to content

Commit

Permalink
Match Argo CD v1.8 tool versions
Browse files Browse the repository at this point in the history
  • Loading branch information
maxbrunet committed Dec 9, 2020
1 parent 600aa98 commit a9598cb
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 36 deletions.
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
## [v0.4.0] - 2020-12-09
### Added
- Add `jsonnet-lint`

### Changed
- Upgrade Jsonnet to v0.17.0
- Upgrade Helm2 to v2.17.0
- Upgrade Helm to v3.4.1
- Upgrade Kustomize to v3.8.1

## [v0.3.2] - 2020-08-10
### Fixed
- jsonnet: Build from `master` branch for [native Go implementation of `std.manifestJsonEx()`](https://github.com/google/go-jsonnet/pull/422)
Expand Down Expand Up @@ -32,7 +42,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Initial commit

[Unreleased]: https://github.com/PaytmLabs/docker-kubernetes-ci/compare/v0.3.2...HEAD
[Unreleased]: https://github.com/PaytmLabs/docker-kubernetes-ci/compare/v0.4.0...HEAD
[v0.4.0]: https://github.com/PaytmLabs/docker-kubernetes-ci/compare/v0.3.2...v0.4.0
[v0.3.2]: https://github.com/PaytmLabs/docker-kubernetes-ci/compare/v0.3.1...v0.3.2
[v0.3.1]: https://github.com/PaytmLabs/docker-kubernetes-ci/compare/v0.3.0...v0.3.1
[v0.3.0]: https://github.com/PaytmLabs/docker-kubernetes-ci/compare/v0.2.0...v0.3.0
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
FROM golang:1.14-alpine AS go-builder

# https://github.com/google/go-jsonnet/pull/422
ARG JSONNET_VERSION=0.16.1-0.20200808175936-2e346e53e721
ARG JSONNET_VERSION=0.17.0
# https://github.com/instrumenta/kubeval/pull/220
ARG KUBEVAL_VERSION=0.0.0-20200515185822-7721cbec724c

Expand All @@ -11,14 +10,15 @@ RUN apk add --no-cache git
RUN go get \
"github.com/google/go-jsonnet/cmd/jsonnet@v${JSONNET_VERSION}" \
"github.com/google/go-jsonnet/cmd/jsonnetfmt@v${JSONNET_VERSION}" \
"github.com/google/go-jsonnet/cmd/jsonnet-lint@v${JSONNET_VERSION}" \
"github.com/instrumenta/kubeval@v${KUBEVAL_VERSION}"

FROM alpine

ARG HELM2_VERSION=2.15.2
ARG HELM_VERSION=3.2.2
ARG HELM2_VERSION=2.17.0
ARG HELM_VERSION=3.4.1
ARG JB_VERSION=0.4.0
ARG KUSTOMIZE_VERSION=3.6.1
ARG KUSTOMIZE_VERSION=3.8.1

RUN apk add --no-cache --virtual .builddeps \
curl \
Expand All @@ -36,4 +36,4 @@ RUN apk add --no-cache --virtual .builddeps \
| tar -zxvf - -C /usr/local/bin kustomize \
&& apk del .builddeps

COPY --from=go-builder /go/bin/jsonnet /go/bin/jsonnetfmt /go/bin/kubeval /usr/local/bin/
COPY --from=go-builder /go/bin/jsonnet /go/bin/jsonnetfmt /go/bin/jsonnet-lint /go/bin/kubeval /usr/local/bin/
25 changes: 0 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,28 +1,3 @@
# docker-kubernetes-ci

Docker image to build and validate Kubernetes manifests

```shell
$ docker run --rm paytmcanada/kubernetes-ci:v0.3.2 helm version
version.BuildInfo{Version:"v3.2.2", GitCommit:"a6ea66349ae3015618da4f547677a14b9ecc09b3", GitTreeState:"clean", GoVersion:"go1.13.12"}

$ docker run --rm paytmcanada/kubernetes-ci:v0.3.2 helm2 version --client
Client: &version.Version{SemVer:"v2.15.2", GitCommit:"8dce272473e5f2a7bf58ce79bb5c3691db54c96b", GitTreeState:"clean"}

$ docker run --rm paytmcanada/kubernetes-ci:v0.3.2 jb --version
v0.4.0

$ docker run --rm paytmcanada/kubernetes-ci:v0.3.2 jsonnet --version
Jsonnet commandline interpreter v0.16.0

$ docker run --rm paytmcanada/kubernetes-ci:v0.3.2 jsonnetfmt --version
Jsonnet reformatter v0.16.0

$ docker run --rm paytmcanada/kubernetes-ci:v0.3.2 kustomize version
{Version:kustomize/v3.6.1 GitCommit:c97fa946d576eb6ed559f17f2ac43b3b5a8d5dbd BuildDate:2020-05-27T20:47:35Z GoOs:linux GoArch:amd64}

$ docker run --rm paytmcanada/kubernetes-ci:v0.3.2 kubeval --version
Version: 0.15.0
Commit: df50ea7fd4fd202458002a40a6a39ffbb3125bad
Date: 2020-04-14T09:32:29Z
```
11 changes: 7 additions & 4 deletions test.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/usr/bin/env bash
set -euo pipefail

readonly HELM2_VERSION=2.15.2
readonly HELM_VERSION=3.2.2
readonly HELM2_VERSION=2.17.0
readonly HELM_VERSION=3.4.1
readonly JB_VERSION=0.4.0
readonly JSONNET_VERSION=0.16.0
readonly JSONNET_VERSION=0.17.0
readonly KUBEVAL_VERSION=dev
readonly KUSTOMIZE_VERSION=3.6.1
readonly KUSTOMIZE_VERSION=3.8.1

printf ">>> Checking git is installed...\n"
git --help >/dev/null
Expand All @@ -26,6 +26,9 @@ printf ">>> Checking jsonnet version is %s...\n" "${JSONNET_VERSION}"
printf ">>> Checking jsonnetfmt version is %s...\n" "${JSONNET_VERSION}"
[[ "$(jsonnetfmt --version)" == "Jsonnet reformatter v${JSONNET_VERSION}" ]]

printf ">>> Checking jsonnet-lint version is %s...\n" "${JSONNET_VERSION}"
[[ "$(jsonnet-lint --version)" == "Jsonnet linter v${JSONNET_VERSION}" ]]

printf ">>> Checking kustomize version is %s...\n" "${KUSTOMIZE_VERSION}"
[[ "$(kustomize version)" == *"Version:kustomize/v${KUSTOMIZE_VERSION} "* ]]

Expand Down

0 comments on commit a9598cb

Please sign in to comment.