Skip to content

Commit

Permalink
Merge pull request #95 from flanksource/feat/update-deps
Browse files Browse the repository at this point in the history 
chore: update k8s.io dependencies
  • Loading branch information
@moshloop
moshloop authored Sep 27, 2023
2 parents b74d715 + 1168633 commit b4c9911
Show file tree
Hide file tree
Showing 3 changed files with 390 additions and 65 deletions.
51 changes: 42 additions & 9 deletions .github/workflows/e2e.yml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Karina upstream
name: upstream

on:
pull_request:
branches: [master, main]

jobs:
test:
Karina:
runs-on: ubuntu-latest
env:
FILE_CHANGES_TO_CORE_ARTIFACTS: true
Expand All @@ -20,27 +20,27 @@ jobs:
- uses: actions/checkout@v2
with:
path: kommons

- uses: actions/checkout@v2
with:
#Using Main branch of Karina Repository
repository: flanksource/karina
path: karina

- uses: actions/setup-go@v2
with:
go-version: "1.18" # The Go version to download (if necessary) and use.

- run: go version

- name: replace Module
run: |
cd karina
module=$(cat go.mod | grep github.com/flanksource/kommons | awk '{print $2}')
go mod edit -replace github.com/flanksource/kommons@$module=$GITHUB_WORKSPACE/kommons
cat go.mod
go mod tidy
- name: Test Make Linux
working-directory: ./karina
run: make linux
Expand All @@ -54,17 +54,50 @@ jobs:
BUILD: test (${{matrix.k8s}}, ${{ matrix.suite }})
ADDITIONAL_CONFIG: -c test/hosted-tests.yaml
run: ./test/test.sh

- name: Upload test results
uses: actions/upload-artifact@v2
with:
if-no-files-found: ignore
name: test-results-${{matrix.k8s}}-${{matrix.suite}}
path: test-results/

- name: Upload snapshots
uses: actions/upload-artifact@v2
with:
if-no-files-found: ignore
name: snapshot-${{matrix.k8s}}-${{matrix.suite}}
path: artifacts/snapshot.zip

canary-checker:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
path: kommons

- uses: actions/checkout@v4
with:
repository: flanksource/canary-checker
path: canary-checker
branch: master

- uses: actions/setup-go@v4
with:
go-version: 1.20.x

- name: replace Module
run: |
cd canary-checker
module=$(cat go.mod | grep github.com/flanksource/kommons | awk '{print $2}')
go mod edit -replace github.com/flanksource/kommons@$module=$GITHUB_WORKSPACE/kommons
cat go.mod
go mod tidy
- name: Test Make Linux
working-directory: ./canary-checker
run: make linux

- name: Build
working-directory: ./canary-checker
run: make
38 changes: 16 additions & 22 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ require (
github.com/tidwall/gjson v1.14.4
golang.org/x/text v0.11.0
gopkg.in/flanksource/yaml.v3 v3.2.3
k8s.io/api v0.26.4
k8s.io/api v0.28.0
k8s.io/apiextensions-apiserver v0.24.4
k8s.io/apimachinery v0.26.4
k8s.io/cli-runtime v0.24.4
k8s.io/client-go v0.26.4
k8s.io/apimachinery v0.28.0
k8s.io/cli-runtime v0.28.0
k8s.io/client-go v0.28.0
sigs.k8s.io/kustomize v2.0.3+incompatible
sigs.k8s.io/kustomize/api v0.12.1
sigs.k8s.io/kustomize/kyaml v0.13.9
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3
sigs.k8s.io/kustomize/kyaml v0.14.3
sigs.k8s.io/yaml v1.3.0
)

Expand All @@ -47,18 +47,18 @@ require (
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/flanksource/is-healthy v0.0.0-20230713150444-ad2a5ef4bb37 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-errors/errors v1.0.1 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gobwas/glob v0.2.3 // 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.3 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/cel-go v0.17.1 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
Expand Down Expand Up @@ -102,17 +102,18 @@ require (
github.com/tidwall/pretty v1.2.1 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/xlab/treeprint v1.1.0 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
github.com/yuin/gopher-lua v1.1.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.11.0 // indirect
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/net v0.13.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/term v0.10.0 // indirect
golang.org/x/time v0.3.0 // indirect
Expand All @@ -129,18 +130,11 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230711102312-30195339c3c7 // indirect
layeh.com/gopher-json v0.0.0-20201124131017-552bb3c4c3bf // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
)

replace (
github.com/spf13/viper => github.com/spf13/viper v1.13.0
k8s.io/api => k8s.io/api v0.26.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.4
k8s.io/apimachinery => k8s.io/apimachinery v0.26.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.4
k8s.io/client-go => k8s.io/client-go v0.26.4
)
replace github.com/spf13/viper => github.com/spf13/viper v1.13.0
Loading

0 comments on commit b4c9911

Please sign in to comment.