Commit 3181840e authored by Shinya Maeda's avatar Shinya Maeda
Browse files

Merge branch 'ci-update-chart-test-k8s-1.25' into 'master' 

ci: update chart test packages to k8s 1.25

See merge request https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image/-/merge_requests/301



Merged-by: default avatarShinya Maeda <shinya@gitlab.com>
Approved-by: default avatarShinya Maeda <shinya@gitlab.com>
Co-authored-by: default avatarHordur Freyr Yngvason <hfyngvason@gitlab.com>
parents b3c5f18c 0f28f43a

.gitlab/ci/chart.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ chart:test: 
  extends: .chart-job

  stage: test

  variables:

    GO_VERSION: "1.16.6"

    GO_VERSION: "1.18.6"

  script:

    - apk add build-base

    - wget https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz

assets/auto-deploy-app/test/go.mod

+104 −6
Original line number Diff line number Diff line 
module gitlab.com/gitlab-org/charts/auto-deploy-app/test



go 1.15

go 1.18



require (

	github.com/cilium/cilium v1.8.1

	github.com/gruntwork-io/terratest v0.32.1

	github.com/stretchr/testify v1.6.1

	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c

	k8s.io/api v0.19.7

	k8s.io/apimachinery v0.19.7

	github.com/gruntwork-io/terratest v0.40.22

	github.com/stretchr/testify v1.8.0

	gopkg.in/yaml.v3 v3.0.1

	k8s.io/api v0.25.2

	k8s.io/apimachinery v0.25.2

)



require (

	cloud.google.com/go/compute v1.10.0 // indirect

	github.com/StackExchange/wmi v0.0.0-20170410192909-ea383cf3ba6e // indirect

	github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 // indirect

	github.com/aws/aws-sdk-go v1.44.107 // indirect

	github.com/beorn7/perks v1.0.1 // indirect

	github.com/boombuler/barcode v1.0.1 // indirect

	github.com/cespare/xxhash/v2 v2.1.1 // indirect

	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect

	github.com/davecgh/go-spew v1.1.1 // indirect

	github.com/emicklei/go-restful/v3 v3.9.0 // indirect

	github.com/fsnotify/fsnotify v1.4.10-0.20200417215612-7f4cf4dd2b52 // indirect

	github.com/ghodss/yaml v1.0.0 // indirect

	github.com/go-errors/errors v1.4.2 // indirect

	github.com/go-logr/logr v1.2.3 // indirect

	github.com/go-ole/go-ole v1.2.1 // indirect

	github.com/go-openapi/analysis v0.19.10 // indirect

	github.com/go-openapi/errors v0.19.3 // indirect

	github.com/go-openapi/jsonpointer v0.19.5 // indirect

	github.com/go-openapi/jsonreference v0.20.0 // indirect

	github.com/go-openapi/loads v0.19.5 // indirect

	github.com/go-openapi/runtime v0.19.4 // indirect

	github.com/go-openapi/spec v0.19.6 // indirect

	github.com/go-openapi/strfmt v0.19.4 // indirect

	github.com/go-openapi/swag v0.22.3 // indirect

	github.com/go-openapi/validate v0.19.5 // indirect

	github.com/go-sql-driver/mysql v1.6.0 // indirect

	github.com/go-stack/stack v1.8.0 // indirect

	github.com/gogo/protobuf v1.3.2 // indirect

	github.com/golang/protobuf v1.5.2 // indirect

	github.com/google/gnostic v0.6.9 // indirect

	github.com/google/gofuzz v1.2.0 // indirect

	github.com/google/uuid v1.3.0 // indirect

	github.com/gruntwork-io/go-commons v0.13.3 // indirect

	github.com/hashicorp/errwrap v1.1.0 // indirect

	github.com/hashicorp/go-multierror v1.1.1 // indirect

	github.com/hashicorp/hcl v1.0.0 // indirect

	github.com/imdario/mergo v0.3.13 // indirect

	github.com/jmespath/go-jmespath v0.4.0 // indirect

	github.com/josharian/intern v1.0.0 // indirect

	github.com/json-iterator/go v1.1.12 // indirect

	github.com/kr/pretty v0.2.0 // indirect

	github.com/kr/text v0.2.0 // indirect

	github.com/magiconair/properties v1.8.5 // indirect

	github.com/mailru/easyjson v0.7.7 // indirect

	github.com/mattn/go-zglob v0.0.3 // indirect

	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect

	github.com/miekg/dns v1.1.31 // indirect

	github.com/mitchellh/go-homedir v1.1.0 // indirect

	github.com/mitchellh/mapstructure v1.1.2 // indirect

	github.com/moby/spdystream v0.2.0 // indirect

	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect

	github.com/modern-go/reflect2 v1.0.2 // indirect

	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect

	github.com/pelletier/go-toml v1.4.0 // indirect

	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect

	github.com/pmezard/go-difflib v1.0.0 // indirect

	github.com/pquerna/otp v1.3.0 // indirect

	github.com/prometheus/client_golang v1.2.0 // indirect

	github.com/prometheus/client_model v0.2.0 // indirect

	github.com/prometheus/common v0.7.0 // indirect

	github.com/prometheus/procfs v0.0.5 // indirect

	github.com/russross/blackfriday/v2 v2.1.0 // indirect

	github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect

	github.com/shirou/gopsutil v0.0.0-20180427012116-c95755e4bcd7 // indirect

	github.com/sirupsen/logrus v1.8.1 // indirect

	github.com/spf13/afero v1.2.2 // indirect

	github.com/spf13/cast v1.3.0 // indirect

	github.com/spf13/jwalterweatherman v1.0.0 // indirect

	github.com/spf13/pflag v1.0.5 // indirect

	github.com/spf13/viper v1.6.1 // indirect

	github.com/subosito/gotenv v1.2.0 // indirect

	github.com/urfave/cli/v2 v2.17.1 // indirect

	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect

	go.mongodb.org/mongo-driver v1.3.0 // indirect

	golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be // indirect

	golang.org/x/net v0.0.0-20220927171203-f486391704dc // indirect

	golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect

	golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect

	golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect

	golang.org/x/term v0.0.0-20220919170432-7a66f970e087 // indirect

	golang.org/x/text v0.3.7 // indirect

	golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect

	google.golang.org/appengine v1.6.7 // indirect

	google.golang.org/protobuf v1.28.1 // indirect

	gopkg.in/inf.v0 v0.9.1 // indirect

	gopkg.in/ini.v1 v1.51.0 // indirect

	gopkg.in/yaml.v2 v2.4.0 // indirect

	k8s.io/client-go v0.25.2 // indirect

	k8s.io/klog v1.0.0 // indirect

	k8s.io/klog/v2 v2.80.1 // indirect

	k8s.io/kube-openapi v0.0.0-20220928191237-829ce0c27909 // indirect

	k8s.io/utils v0.0.0-20220922133306-665eaaec4324 // indirect

	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect

	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect

	sigs.k8s.io/yaml v1.3.0 // indirect

)



replace github.com/optiopay/kafka => github.com/cilium/kafka v0.0.0-20180809090225-01ce283b732b

assets/auto-deploy-app/test/go.sum

+188 −279

File changed.

Preview size limit exceeded, changes collapsed.

assets/auto-deploy-app/test/templates/deployment_test.go

+4 −4
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ func TestDeploymentTemplate(t *testing.T) { 
				"lifecycle.preStop.exec.command[2]": "sleep 10",

			},

			ExpectedLifecycle: &coreV1.Lifecycle{

				PreStop: &coreV1.Handler{

				PreStop: &coreV1.LifecycleHandler{

					Exec: &coreV1.ExecAction{

						Command: []string{"/bin/sh", "-c", "sleep 10"},

					},
@@ -422,7 +422,7 @@ func TestDeploymentTemplate(t *testing.T) { 
				"livenessProbe.httpHeaders[0].value": "awesome",

			},

			ExpectedLivenessProbe: &coreV1.Probe{

				Handler: coreV1.Handler{

				ProbeHandler: coreV1.ProbeHandler{

					HTTPGet: &coreV1.HTTPGetAction{

						Path:   "/",

						Port:   intstr.FromInt(1234),
@@ -451,7 +451,7 @@ func TestDeploymentTemplate(t *testing.T) { 
			},

			ExpectedLivenessProbe: defaultLivenessProbe(),

			ExpectedReadinessProbe: &coreV1.Probe{

				Handler: coreV1.Handler{

				ProbeHandler: coreV1.ProbeHandler{

					HTTPGet: &coreV1.HTTPGetAction{

						Path:   "/",

						Port:   intstr.FromInt(2345),
@@ -481,7 +481,7 @@ func TestDeploymentTemplate(t *testing.T) { 
			ExpectedLivenessProbe:  defaultLivenessProbe(),

			ExpectedReadinessProbe: defaultReadinessProbe(),

			ExpectedStartupProbe: &coreV1.Probe{

				Handler: coreV1.Handler{

				ProbeHandler: coreV1.ProbeHandler{

					HTTPGet: &coreV1.HTTPGetAction{

						Path:   "/",

						Port:   intstr.FromInt(2345),

assets/auto-deploy-app/test/templates/test_helpers.go

+8 −8
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ func mergeStringMap(dst, src map[string]string) { 


func defaultLivenessProbe() *coreV1.Probe {

	return &coreV1.Probe{

		Handler: coreV1.Handler{

		ProbeHandler: coreV1.ProbeHandler{

			HTTPGet: &coreV1.HTTPGetAction{

				Path:   "/",

				Port:   intstr.FromInt(5000),
@@ -126,7 +126,7 @@ func defaultLivenessProbe() *coreV1.Probe { 


func defaultReadinessProbe() *coreV1.Probe {

	return &coreV1.Probe{

		Handler: coreV1.Handler{

		ProbeHandler: coreV1.ProbeHandler{

			HTTPGet: &coreV1.HTTPGetAction{

				Path:   "/",

				Port:   intstr.FromInt(5000),
@@ -140,7 +140,7 @@ func defaultReadinessProbe() *coreV1.Probe { 


func workerLivenessProbe() *coreV1.Probe {

	return &coreV1.Probe{

		Handler: coreV1.Handler{

		ProbeHandler: coreV1.ProbeHandler{

			HTTPGet: &coreV1.HTTPGetAction{

				Path:   "/worker",

				Port:   intstr.FromInt(5000),
@@ -154,7 +154,7 @@ func workerLivenessProbe() *coreV1.Probe { 


func workerReadinessProbe() *coreV1.Probe {

	return &coreV1.Probe{

		Handler: coreV1.Handler{

		ProbeHandler: coreV1.ProbeHandler{

			HTTPGet: &coreV1.HTTPGetAction{

				Path:   "/worker",

				Port:   intstr.FromInt(5000),
@@ -168,7 +168,7 @@ func workerReadinessProbe() *coreV1.Probe { 


func execReadinessProbe() *coreV1.Probe {

	return &coreV1.Probe{

		Handler: coreV1.Handler{

		ProbeHandler: coreV1.ProbeHandler{

			Exec: &coreV1.ExecAction{

				Command: []string{"echo", "hello"},

			},
@@ -180,7 +180,7 @@ func execReadinessProbe() *coreV1.Probe { 


func execLivenessProbe() *coreV1.Probe {

	return &coreV1.Probe{

		Handler: coreV1.Handler{

		ProbeHandler: coreV1.ProbeHandler{

			Exec: &coreV1.ExecAction{

				Command: []string{"echo", "hello"},

			},
@@ -192,7 +192,7 @@ func execLivenessProbe() *coreV1.Probe { 


func tcpLivenessProbe() *coreV1.Probe {

	return &coreV1.Probe{

		Handler: coreV1.Handler{

		ProbeHandler: coreV1.ProbeHandler{

			TCPSocket: &coreV1.TCPSocketAction{

				Port: intstr.IntOrString{IntVal: 5000},

			},
@@ -204,7 +204,7 @@ func tcpLivenessProbe() *coreV1.Probe { 


func tcpReadinessProbe() *coreV1.Probe {

	return &coreV1.Probe{

		Handler: coreV1.Handler{

		ProbeHandler: coreV1.ProbeHandler{

			TCPSocket: &coreV1.TCPSocketAction{

				Port: intstr.IntOrString{IntVal: 5000},

			},