Skip to content
This repository has been archived by the owner on Mar 19, 2024. It is now read-only.

conformance: skip failing tests #205

Closed
wants to merge 28 commits into from
Closed

conformance: skip failing tests #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
90f8797
Install Consul from Helm repository for conformance tests
nathancoleman May 5, 2022
ee1599f
Skip tests that we can't currently pass due to xDS control
nathancoleman May 13, 2022
d62dad2
Update Gateway API's ParentRef -> ParentReference
nathancoleman May 13, 2022
5c9e3f8
Use new conformance test runner in conformance workflow
nathancoleman May 13, 2022
ddcbda3
e2e: fixup imports and CRD types
mikemorris Jun 1, 2022
2853996
Revert "Install Consul from Helm repository for conformance tests"
mikemorris Jun 1, 2022
c406897
conformance: update test infra programatically instead of patching ba…
mikemorris Jun 2, 2022
c5b4759
conformance: skip tests that create additional gateways which never r…
mikemorris Jun 2, 2022
bdbd8bb
conformance: try patching base manifests with kustomize/api/krusty
mikemorris Jun 2, 2022
b9dd3fe
Revert "conformance: try patching base manifests with kustomize/api/k…
mikemorris Jun 2, 2022
8a1a913
conformance: restore kustomization.yaml
mikemorris Jun 7, 2022
09cfdc9
conformance: reimplement kustomize patch with krusty/kyaml
mikemorris Jun 7, 2022
a56ecef
deps: add replace directive for hashicorp/gateway-api
mikemorris Jun 7, 2022
f9b4ddd
k8s: update Handler->ProbeHandler for compat with v0.23+
mikemorris Jun 7, 2022
43187ef
k8s/reconciler: deref for l.listener.TLS.CertificateRefs no longer ne…
mikemorris Jun 7, 2022
0d93622
k8s/logger: reimplement k8s logger as LogSink
mikemorris Jun 7, 2022
b10e542
gateway-api: update CertificateRefs to []SecretObjectReference from p…
mikemorris Jun 7, 2022
639dff9
testing: update readCRDs signature to match envtest reqs
mikemorris Jun 7, 2022
2cbe5a9
testing: more []*CustomResourceDefinition fixup
mikemorris Jun 7, 2022
ddceb3e
e2e: fixup missed ParentRef->ParentReference rename
mikemorris Jun 7, 2022
77c6ad7
conformance: append local:// prefix to manifestsPath
mikemorris Jun 7, 2022
ca0ffcc
deps: update hashicorp/gateway-api pin
mikemorris Jun 7, 2022
7bed319
deps: bump hashicorp/gateway-api gitsha to include 60s conformance ti…
mikemorris Jun 7, 2022
d474a88
conformance: write kusomtized resources back to disk as YAML
mikemorris Jun 7, 2022
3c64377
conformance: skip HTTPExactPathMatching test
mikemorris Jun 8, 2022
be9e059
conformance: use t.TempDir and kyaml fs instead of os
mikemorris Jun 8, 2022
6363951
conformance: move kustomization logic into kustomize.go
mikemorris Jun 8, 2022
a265afc
ci: remove clone gateway-api step
mikemorris Jun 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 2 additions & 17 deletions .github/workflows/conformance.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ jobs:
# GITHUB_WORKSPACE/
# consul-api-gateway/
# consul-k8s/
# gateway-api/
- name: Checkout consul-api-gateway
uses: actions/checkout@v2
with:
Expand All @@ -48,13 +47,6 @@ jobs:
repository: "hashicorp/consul-k8s"
path: "consul-k8s"

- name: Clone gateway-api
uses: actions/checkout@v2
with:
repository: "hashicorp/gateway-api"
ref: "60s-time-to-consistency"
path: "gateway-api"

- name: Setup Goenv
uses: ./consul-api-gateway/.github/actions/goenv
with:
Expand Down Expand Up @@ -98,16 +90,9 @@ jobs:
helm install --values ./consul-config.yaml consul $GITHUB_WORKSPACE/consul-k8s/charts/consul --create-namespace --namespace=consul
kubectl wait --for=condition=Ready --timeout=60s --namespace=consul pods --all

- name: Patch testing resources
working-directory: "consul-api-gateway/internal/testing/conformance"
run: |
cp kustomization.yaml proxydefaults.yaml $GITHUB_WORKSPACE/gateway-api/conformance/
cd $GITHUB_WORKSPACE/gateway-api/conformance/
kubectl kustomize ./ --output ./base/manifests.yaml

- name: Run tests
working-directory: "gateway-api/conformance"
run: go test -v -timeout 10m ./ --gateway-class consul-api-gateway
working-directory: "consul-api-gateway/internal/testing/conformance"
run: go test -v -timeout 10m ./

- name: Setup tmate session
uses: mxschmitt/action-tmate@v3
Expand Down
90 changes: 57 additions & 33 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,42 +7,54 @@ require (
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/docker/docker v20.10.9+incompatible
github.com/envoyproxy/go-control-plane v0.9.10-0.20211015211602-cfdef0997689
github.com/go-logr/logr v0.4.0
github.com/go-logr/logr v1.2.0
github.com/golang/mock v1.6.0
github.com/google/uuid v1.2.0
github.com/hashicorp/consul/api v1.12.1-0.20220111183205-dcf1cd485363
github.com/hashicorp/consul/sdk v0.8.0
github.com/hashicorp/go-hclog v0.16.2
github.com/hashicorp/go-multierror v1.1.0
github.com/mitchellh/cli v1.1.2
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/client_golang v1.12.1
github.com/stretchr/testify v1.7.0
github.com/vladimirvivien/gexe v0.1.1
golang.org/x/exp v0.0.0-20220518171630-0b5c67f07fdf
golang.org/x/net v0.0.0-20210825183410-e898025ed96a
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
google.golang.org/grpc v1.40.0
k8s.io/api v0.22.1
k8s.io/apiextensions-apiserver v0.21.3
k8s.io/apimachinery v0.22.1
k8s.io/client-go v0.22.1
k8s.io/klog/v2 v2.10.0
sigs.k8s.io/controller-runtime v0.9.6
k8s.io/api v0.24.1
k8s.io/apiextensions-apiserver v0.24.1
k8s.io/apimachinery v0.24.1
k8s.io/client-go v0.24.1
k8s.io/klog/v2 v2.60.1
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
sigs.k8s.io/controller-runtime v0.12.1
sigs.k8s.io/e2e-framework v0.0.3
sigs.k8s.io/gateway-api v0.4.1
sigs.k8s.io/gateway-api v0.4.1-0.20220512164314-c7da26bec210
sigs.k8s.io/kustomize/api v0.11.5
sigs.k8s.io/kustomize/kyaml v0.13.7
)

require (
cloud.google.com/go v0.81.0 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/Masterminds/goutils v1.1.0 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
github.com/Microsoft/go-winio v0.4.17 // indirect
github.com/Microsoft/hcsshim v0.9.0 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/speakeasy v0.1.0 // indirect
github.com/census-instrumentation/opencensus-proto v0.2.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe // indirect
github.com/containerd/cgroups v1.0.1 // indirect
github.com/containerd/containerd v1.5.7 // indirect
Expand All @@ -51,17 +63,23 @@ require (
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
github.com/envoyproxy/protoc-gen-validate v0.1.0 // indirect
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/fatih/color v1.12.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/go-errors/errors v1.0.1 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
Expand All @@ -71,7 +89,9 @@ require (
github.com/hashicorp/serf v0.9.6 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
Expand All @@ -84,36 +104,40 @@ require (
github.com/moby/sys/mountinfo v0.4.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/onsi/gomega v1.15.0 // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/opencontainers/runc v1.0.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/posener/complete v1.2.3 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.26.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
go.opencensus.io v0.23.0 // indirect
go.uber.org/zap v1.19.0 // indirect
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
google.golang.org/protobuf v1.26.0 // indirect
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/component-base v0.21.3 // indirect
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
k8s.io/utils v0.0.0-20210820185131-d34e5cb4466e // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
k8s.io/component-base v0.24.1 // indirect
k8s.io/kube-openapi v0.0.0-20220401212409-b28bf2818661 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace sigs.k8s.io/gateway-api => github.com/hashicorp/gateway-api v0.4.1-0.20220607205307-8a3ba8bfecc0