Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix panic when determining cluster domain. #115

Merged
merged 5 commits into from
Dec 5, 2023
+1,574 −1,337
Merged

Fix panic when determining cluster domain. #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a30dd57
Fix a completely broken integration_test package.
thallgren Dec 5, 2023
ecf237c
Fix panic when determining cluster domain.
thallgren Dec 5, 2023
6955feb
Update dependencies.
thallgren Dec 5, 2023
49b30c4
Use private registry for CI tests.
thallgren Dec 5, 2023
be8ba87
Ensure that httptest.Server is always closed.
thallgren Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 25 additions & 54 deletions .github/workflows/integration_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ on:
pull_request_target:
types:
- labeled

env:
A8R_AGENT_REGISTRY: 'localhost:5000'
KUBECONFIG: ${{ github.workspace }}/kubeconfig.yaml

jobs:
build-image:
integration-test:
runs-on: ubuntu-latest
if: ${{ github.event.label.name == 'ok to test' }}
steps:
Expand All @@ -22,69 +27,35 @@ jobs:
uses: actions/setup-go@v3
with:
go-version: stable
- name: Build image
run: |
make image-tar
- name: Upload image
uses: actions/upload-artifact@v3
with:
name: image
path: build-output/ambassador-agent-image.tar
test:
runs-on: ubuntu-latest
needs: build-image
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
ref: "${{ github.event.pull_request.head.sha }}"
- name: Get last run
uses: ./.github/actions/rerun-cache
id: get_last_run
- name: Setup Go
uses: actions/setup-go@v3
with:
go-version: stable
- name: Setup kubectl
uses: azure/setup-kubectl@v3
id: kubectl
if: steps.get_last_run.outputs.passed != 'success'
- name: Download image
uses: actions/download-artifact@v3
if: steps.get_last_run.outputs.passed != 'success'
with:
name: image
- name: Prepare kluster
uses: ./.github/actions/prepare-kluster
if: steps.get_last_run.outputs.passed != 'success'
- name: Provision Kubeception cluster
id: kluster
with:
token: ${{ secrets.DEV_AMBASSADOR_AGENT_KUBECEPTION_TOKEN }}
image-tar: ambassador-agent-image.tar
github-sha: ${{ github.event.pull_request.head.sha }}
uses: datawire/infra-actions/[email protected]
with:
distribution: Kubeception
version: 1.26
kubeconfig: ${{ env.KUBECONFIG }}
kubeceptionToken: ${{ secrets.DEV_AMBASSADOR_AGENT_KUBECEPTION_TOKEN }}
gkeCredentials: '{"project_id": "foo"}' # See https://github.com/datawire/infra-actions/issues/66
- name: Add a private image registry to the cluster
run: make private-registry
- name: Build image
id: build
run: |
make push-image
echo "version=$(cat build-output/version.txt)" >> $GITHUB_OUTPUT
- name: Run tests
if: steps.get_last_run.outputs.passed != 'success'
uses: nick-invision/retry@v2
env:
A8R_AGENT_VERSION: ${{ steps.build.outputs.version }}
AMBASSADOR_AGENT_DOCKER_IMAGE: localhost:5000/ambassador-agent:${{ steps.build.outputs.version }}
KAT_SERVER_DOCKER_IMAGE: docker.io/datawiredev/kat-server:3.0.1-0.20220817135951-2cb28ef4f415
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

random thought:

I'm not too familiar with the Agent code base beyond knowing it was historically in emissary-ingress repo and just scrapes Edgissary for data and forwards it on to Ambassador Cloud. But, I was surprised to see references to the kat-server so I will take it as a mental note to investigate this further during cooldown.

with:
max_attempts: 3
timeout_minutes: 15
command: |
export DTEST_KUBECONFIG=${{ steps.kluster.outputs.kubeconfig }}
export KUBECONFIG=${{ steps.kluster.outputs.kubeconfig }}
export AMBASSADOR_AGENT_DOCKER_IMAGE=datawiredev/ambassador-agent:dev-latest
export KAT_SERVER_DOCKER_IMAGE=docker.io/datawiredev/kat-server:3.0.1-0.20220817135951-2cb28ef4f415
make go-integration-test
- name: Mark test as succesfull
run: echo "::set-output name=run_result::success" > run_result
- name: Cleanup kluster
uses: ./.github/actions/cleanup-kluster
if: always()
with:
token: ${{ secrets.DEV_AMBASSADOR_AGENT_KUBECEPTION_TOKEN }}
github-sha: ${{ github.event.pull_request.head.sha }}





5 changes: 1 addition & 4 deletions .github/workflows/licenses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ name: "License verification"
on:
pull_request:

env:
GO_VERSION: 1.19.5

jobs:
dependency_info_linux:
name: "Verify use of forbidden licenses"
Expand All @@ -19,7 +16,7 @@ jobs:
ref: "${{ github.event.pull_request.head.sha }}"
- uses: actions/setup-go@v3
with:
go-version: "${{env.GO_VERSION}}"
go-version: stable
- name: "Generate dependency information"
shell: bash
run: make generate
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/test_lint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ on:
branches:
- "**"

env:
GO_VERSION: 1.19.5

jobs:

lint:
Expand All @@ -20,7 +17,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: "${{env.GO_VERSION}}"
go-version: stable

- name: Lint
run: |
Expand All @@ -39,7 +36,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: "${{env.GO_VERSION}}"
go-version: stable

- name: go unit tests
run: |
Expand Down
23 changes: 15 additions & 8 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,21 @@ linters-settings:
max-complexity: 32
skip-tests: true
depguard:
list-type: blacklist
include-go-root: true
packages-with-error-message:
- io/ioutil: "`io/ioutil` is deprecated in Go 1.16, use `io` or `os` instead"
- syscall: "Use `golang.org/x/sys/...` instead of `syscall`"
- github.com/golang/protobuf: "Use `google.golang.org/protobuf` instead of `github.com/golang/protobuf`"
- github.com/datawire/dlib/dutil: "Use either `github.com/datawire/dlib/derror` or `github.com/datawire/dlib/dhttp` instead of `github.com/datawire/dlib/dutil`"
- golang.org/x/net/http2/h2c: "Use `github.com/datawire/dlib/dhttp` instead of `golang.org/x/net/http2/h2c`"
rules:
main:
files:
- $all
deny:
- pkg: io/ioutil
desc: "`io/ioutil` is deprecated in Go 1.16, use `io` or `os` instead"
- pkg: syscall
desc: "Use `golang.org/x/sys/...` instead of `syscall`"
- pkg: github.com/golang/protobuf
desc: "Use `google.golang.org/protobuf` instead of `github.com/golang/protobuf`"
- pkg: github.com/datawire/dlib/dutil
desc: "Use either `github.com/datawire/dlib/derror` or `github.com/datawire/dlib/dhttp` instead of `github.com/datawire/dlib/dutil`"
- pkg: golang.org/x/net/http2/h2c
desc: "Use `github.com/datawire/dlib/dhttp` instead of `golang.org/x/net/http2/h2c`"
gomodguard:
blocked:
modules:
Expand Down
Loading
Loading