Skip to content

Commit 460885c

Browse files
sudermanjrsudermanjr
committed
Cleanup things and test the build
1 parent bd504cd commit 460885c

19 files changed

+33
-946
lines changed

‎.circleci/config.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
version: 2.1
1616

1717
orbs:
18-
rok8s: fairwinds/rok8s-scripts@11
18+
rok8s: fairwinds/rok8s-scripts@12
1919
oss-docs: fairwinds/oss-docs@0
2020

2121
references:
@@ -24,9 +24,9 @@ references:
2424
workspace-location: /
2525
pre_script: end_to_end_testing/pre_go.sh
2626
script: end_to_end_testing/run_go.sh
27-
command_runner_image: quay.io/reactiveops/ci-images:v11-buster
27+
command_runner_image: quay.io/reactiveops/ci-images:v12-buster
2828
enable_docker_layer_caching: false
29-
store-test-results: /tmp/test-results
29+
store-test-results: /tmp/test-results/
3030
requires:
3131
- test
3232
- snapshot
@@ -41,21 +41,21 @@ references:
4141
command: |
4242
apk --update add curl yq
4343
cd /tmp
44-
curl -LO https://releases.hashicorp.com/vault/1.9.4/vault_1.9.4_linux_amd64.zip
45-
unzip vault_1.9.4_linux_amd64.zip
44+
curl -LO https://releases.hashicorp.com/vault/1.14.2/vault_1.14.2_linux_amd64.zip
45+
unzip vault_1.14.2_linux_amd64.zip
4646
mv vault /usr/bin/vault
4747
jobs:
4848
test:
4949
working_directory: /home/circleci/go/src/github.com/fairwindsops/reckoner
5050
docker:
51-
- image: cimg/go:1.18
51+
- image: cimg/go:1.20
5252
steps:
5353
- checkout
5454
- run: make test
5555
snapshot:
5656
working_directory: /go/src/github.com/fairwindsops/reckoner
5757
docker:
58-
- image: goreleaser/goreleaser:v1.10.3
58+
- image: goreleaser/goreleaser:v1.20.0
5959
steps:
6060
- checkout
6161
- setup_remote_docker
@@ -74,7 +74,7 @@ jobs:
7474
resource_class: large
7575
shell: /bin/bash
7676
docker:
77-
- image: goreleaser/goreleaser:v1.10.3
77+
- image: goreleaser/goreleaser:v1.20.0
7878
steps:
7979
- checkout
8080
- setup_remote_docker
@@ -108,16 +108,16 @@ workflows:
108108
branches:
109109
only: /.*/
110110
- rok8s/kubernetes_e2e_tests:
111-
name: "End-To-End Kubernetes 1.20.2"
112-
kind_node_image: "kindest/node:v1.20.2@sha256:15d3b5c4f521a84896ed1ead1b14e4774d02202d5c65ab68f30eeaf310a3b1a7"
111+
name: "End-To-End Kubernetes 1.25"
112+
kind_node_image: "kindest/node:v1.25.3@sha256:f52781bc0d7a19fb6c405c2af83abfeb311f130707a0e219175677e366cc45d1"
113113
<<: *e2e_configuration
114114
- rok8s/kubernetes_e2e_tests:
115-
name: "End-To-End Kubernetes 1.21.1"
116-
kind_node_image: "kindest/node:v1.21.2@sha256:9d07ff05e4afefbba983fac311807b3c17a5f36e7061f6cb7e2ba756255b2be4"
115+
name: "End-To-End Kubernetes 1.26"
116+
kind_node_image: "kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb"
117117
<<: *e2e_configuration
118118
- rok8s/kubernetes_e2e_tests:
119-
name: "End-To-End Kubernetes 1.22.0"
120-
kind_node_image: "kindest/node:v1.22.0@sha256:b8bda84bb3a190e6e028b1760d277454a72267a5454b57db34437c34a588d047"
119+
name: "End-To-End Kubernetes 1.27"
120+
kind_node_image: "kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72"
121121
<<: *e2e_configuration
122122
release:
123123
jobs:

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ govet-report.out
99
/bin
1010
/build
1111
/dist
12-
/reckoner-go
12+
/reckoner

‎MANIFEST.in

-2
This file was deleted.

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ GOCMD=GO111MODULE=on go
33
GOBUILD=$(GOCMD) build
44
GOCLEAN=$(GOCMD) clean
55
GOTEST=$(GOCMD) test
6-
BINARY_NAME=reckoner-go
6+
BINARY_NAME=reckoner
77
COMMIT := $(shell git rev-parse HEAD)
88
VERSION := "0.0.0"
99

‎docs/changelog_details/schema_validation.md

-32
This file was deleted.

‎end_to_end_testing/course_files/25_test_import.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ charts:
1010
import-test:
1111
repository: fairwinds-incubator
1212
chart: basic-demo
13-
version: 0.4.3
13+
version: 1.0.0
1414
values:
1515
expect-value: 1.05
1616
expect-bool-value: false

‎end_to_end_testing/run_go.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ set -x
44
set -e
55

66
# Install Go
7-
curl -LO https://go.dev/dl/go1.18.5.linux-amd64.tar.gz
7+
curl -LO https://go.dev/dl/go1.20.7.linux-amd64.tar.gz
88

9-
tar -C /usr/local -xzf go1.18.5.linux-amd64.tar.gz
9+
tar -C /usr/local -xzf go1.20.7.linux-amd64.tar.gz
1010
export PATH=$PATH:/usr/local/go/bin
1111
go version
1212

1313
# build
1414
cd /reckoner
1515
make build
1616

17-
mv /reckoner/reckoner-go /usr/local/bin/reckoner
17+
mv /reckoner/reckoner /usr/local/bin/reckoner
1818
reckoner version
1919

20-
curl -LO https://github.com/ovh/venom/releases/download/v0.28.0/venom.linux-amd64
20+
curl -LO https://github.com/ovh/venom/releases/download/v1.1.0/venom.linux-amd64
2121
mv venom.linux-amd64 /usr/local/bin/venom
2222
chmod +x /usr/local/bin/venom
2323

@@ -26,5 +26,5 @@ mkdir -p /tmp/test-results
2626
cd /reckoner/end_to_end_testing
2727

2828
# The parallelization number must remain relatively low otherwise the tests become flaky due to resources and pending pods and such
29-
venom run tests/* --log debug --output-dir=/tmp/test-results --parallel=2 --strict
29+
venom run tests/* --output-dir=/tmp/test-results
3030
exit $?

‎end_to_end_testing/tests/25_import.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ testcases:
1818
assertions:
1919
- "result.code ShouldEqual 0"
2020
- 'result.systemout ShouldContainSubstring "namespace: {{.namespace}}"'
21-
- 'result.systemout ShouldContainSubstring "version: 0.4.3"'
21+
- 'result.systemout ShouldContainSubstring "version: 1.0.0"'
2222
- 'result.systemout ShouldContainSubstring "chart: basic-demo"'
2323
- 'result.systemout ShouldContainSubstring "name: {{.release}}"'
2424
- 'result.systemout ShouldContainSubstring "expect-value: 1.05"'

‎end_to_end_testing/tests/26_shell_executor_secret.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ testcases:
2323
- name: 26 - cleanup
2424
steps:
2525
- script: |
26-
helm -n {{.namespace}} delete
26+
helm -n {{.namespace}} delete {{.release}}
2727
kubectl delete ns {{.namespace}}

‎go.mod

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/fairwindsops/reckoner
22

3-
go 1.18
3+
go 1.20
44

55
require (
66
github.com/Masterminds/semver/v3 v3.2.0
@@ -27,14 +27,6 @@ require (
2727
)
2828

2929
require (
30-
cloud.google.com/go/compute v1.14.0 // indirect
31-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
32-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
33-
github.com/Azure/go-autorest/autorest v0.11.28 // indirect
34-
github.com/Azure/go-autorest/autorest/adal v0.9.22 // indirect
35-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
36-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
37-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
3830
github.com/Microsoft/go-winio v0.6.0 // indirect
3931
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
4032
github.com/acomagu/bufpipe v1.0.4 // indirect
@@ -49,7 +41,6 @@ require (
4941
github.com/go-openapi/jsonreference v0.20.2 // indirect
5042
github.com/go-openapi/swag v0.22.3 // indirect
5143
github.com/gogo/protobuf v1.3.2 // indirect
52-
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
5344
github.com/golang/protobuf v1.5.2 // indirect
5445
github.com/google/gnostic v0.6.9 // indirect
5546
github.com/google/go-cmp v0.5.9 // indirect
@@ -64,7 +55,6 @@ require (
6455
github.com/kevinburke/ssh_config v1.2.0 // indirect
6556
github.com/mailru/easyjson v0.7.7 // indirect
6657
github.com/mattn/go-isatty v0.0.17 // indirect
67-
github.com/mitchellh/go-homedir v1.1.0 // indirect
6858
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6959
github.com/modern-go/reflect2 v1.0.2 // indirect
7060
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect

0 commit comments

Comments
 (0)