Skip to content

Commit b8f1144

Browse files
authored
Merge pull request #38 from UdayMadhav88/udaymothadaka-patch-1
Updated go.mod file with necessary dependencies to improve functionality
2 parents c0386a4 + 0e5ef1b commit b8f1144

File tree

37 files changed

+307
-448
lines changed

37 files changed

+307
-448
lines changed

.github/workflows/go-build.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Go Build
2+
run-name: ${{ github.actor }} runs build
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
10+
jobs:
11+
build-k8s-athenz-syncer:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Setup Go 1.22.x
15+
uses: actions/setup-go@v5
16+
with:
17+
# Semantic version range syntax or exact version of Go
18+
go-version: '1.22.x'
19+
- name: Check out repository code
20+
uses: actions/checkout@v4
21+
- run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
22+
- name: List files in the repository
23+
run: |
24+
ls ${{ github.workspace }}
25+
- name: Run tests
26+
run: go test -v -race ./...
27+
- name: Print diff
28+
run: diff -u <(echo -n) <(gofmt -d .) || true
29+
- name: Go vet
30+
run: go vet ./...
31+
- name: Go build
32+
run: go build -v -race ./...
33+
- run: echo "🍏 This job's status is ${{ job.status }}."

go.mod

Lines changed: 56 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,64 @@
1-
module github.com/yahoo/k8s-athenz-syncer
1+
module github.com/AthenZ/k8s-athenz-syncer
22

3-
go 1.14
3+
go 1.22.0
44

55
require (
6+
github.com/AthenZ/athenz v1.11.59
67
github.com/ardielle/ardielle-go v1.5.2
78
github.com/cenkalti/backoff v2.2.1+incompatible
8-
github.com/fsnotify/fsnotify v1.4.9
9-
github.com/google/go-cmp v0.4.0
10-
github.com/imdario/mergo v0.3.7 // indirect
11-
github.com/mash/go-accesslog v1.2.0
9+
github.com/fsnotify/fsnotify v1.7.0
10+
github.com/google/go-cmp v0.6.0
11+
github.com/mash/go-accesslog v1.3.0
1212
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
1313
github.com/pkg/errors v0.9.1
14-
github.com/sirupsen/logrus v1.4.2
15-
github.com/stretchr/testify v1.5.1
16-
github.com/tevino/abool v0.0.0-20170917061928-9b9efcf221b5
17-
github.com/yahoo/athenz v1.9.30
18-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
19-
gopkg.in/natefinch/lumberjack.v2 v2.0.0
20-
k8s.io/api v0.19.15
21-
k8s.io/apimachinery v0.19.15
22-
k8s.io/client-go v0.19.15
23-
k8s.io/klog/v2 v2.2.0 // indirect
14+
github.com/sirupsen/logrus v1.9.3
15+
github.com/stretchr/testify v1.9.0
16+
github.com/tevino/abool v1.2.0
17+
gopkg.in/natefinch/lumberjack.v2 v2.2.1
18+
k8s.io/api v0.30.1
19+
k8s.io/apimachinery v0.30.1
20+
k8s.io/client-go v0.30.1
21+
k8s.io/klog/v2 v2.120.1
22+
)
23+
24+
require (
25+
github.com/davecgh/go-spew v1.1.1 // indirect
26+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
27+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
28+
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
29+
github.com/go-logr/logr v1.4.1 // indirect
30+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
31+
github.com/go-openapi/jsonreference v0.20.2 // indirect
32+
github.com/go-openapi/swag v0.22.3 // indirect
33+
github.com/gogo/protobuf v1.3.2 // indirect
34+
github.com/golang/protobuf v1.5.4 // indirect
35+
github.com/google/gnostic-models v0.6.8 // indirect
36+
github.com/google/gofuzz v1.2.0 // indirect
37+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
38+
github.com/google/uuid v1.6.0 // indirect
39+
github.com/imdario/mergo v0.3.7 // indirect
40+
github.com/josharian/intern v1.0.0 // indirect
41+
github.com/json-iterator/go v1.1.12 // indirect
42+
github.com/mailru/easyjson v0.7.7 // indirect
43+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
44+
github.com/modern-go/reflect2 v1.0.2 // indirect
45+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
46+
github.com/pmezard/go-difflib v1.0.0 // indirect
47+
github.com/spf13/pflag v1.0.5 // indirect
48+
golang.org/x/crypto v0.23.0 // indirect
49+
golang.org/x/net v0.25.0 // indirect
50+
golang.org/x/oauth2 v0.19.0 // indirect
51+
golang.org/x/sys v0.20.0 // indirect
52+
golang.org/x/term v0.20.0 // indirect
53+
golang.org/x/text v0.15.0 // indirect
54+
golang.org/x/time v0.5.0 // indirect
55+
google.golang.org/protobuf v1.34.1 // indirect
56+
gopkg.in/inf.v0 v0.9.1 // indirect
57+
gopkg.in/yaml.v2 v2.4.0 // indirect
58+
gopkg.in/yaml.v3 v3.0.1 // indirect
59+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
60+
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
61+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
62+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
63+
sigs.k8s.io/yaml v1.3.0 // indirect
2464
)

go.sum

Lines changed: 117 additions & 325 deletions
Large diffs are not rendered by default.

main.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ import (
2929
"syscall"
3030
"time"
3131

32-
"github.com/yahoo/k8s-athenz-syncer/pkg/controller"
33-
"github.com/yahoo/k8s-athenz-syncer/pkg/cron"
34-
"github.com/yahoo/k8s-athenz-syncer/pkg/crypto"
35-
"github.com/yahoo/k8s-athenz-syncer/pkg/identity"
36-
"github.com/yahoo/k8s-athenz-syncer/pkg/util"
32+
"github.com/AthenZ/k8s-athenz-syncer/pkg/controller"
33+
"github.com/AthenZ/k8s-athenz-syncer/pkg/cron"
34+
"github.com/AthenZ/k8s-athenz-syncer/pkg/crypto"
35+
"github.com/AthenZ/k8s-athenz-syncer/pkg/identity"
36+
"github.com/AthenZ/k8s-athenz-syncer/pkg/util"
3737
"k8s.io/client-go/kubernetes"
3838
"k8s.io/client-go/tools/clientcmd"
3939

40-
"github.com/yahoo/athenz/clients/go/zms"
41-
athenzClientset "github.com/yahoo/k8s-athenz-syncer/pkg/client/clientset/versioned"
42-
"github.com/yahoo/k8s-athenz-syncer/pkg/log"
43-
r "github.com/yahoo/k8s-athenz-syncer/pkg/reloader"
40+
"github.com/AthenZ/athenz/clients/go/zms"
41+
athenzClientset "github.com/AthenZ/k8s-athenz-syncer/pkg/client/clientset/versioned"
42+
"github.com/AthenZ/k8s-athenz-syncer/pkg/log"
43+
r "github.com/AthenZ/k8s-athenz-syncer/pkg/reloader"
4444
"k8s.io/klog/v2"
4545
)
4646

pkg/apis/athenz/v1/types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package v1
1717

1818
import (
1919
"github.com/mohae/deepcopy"
20-
"github.com/yahoo/athenz/clients/go/zms"
20+
"github.com/AthenZ/athenz/clients/go/zms"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
)
2323

@@ -39,7 +39,7 @@ type AthenzDomain struct {
3939
Spec AthenzDomainSpec `json:"spec,omitempty"`
4040
}
4141

42-
// AthenzDomainSpec contains the SignedDomain object https://github.com/yahoo/athenz/clients/go/zms
42+
// AthenzDomainSpec contains the SignedDomain object https://github.com/AthenZ/athenz/clients/go/zms
4343
type AthenzDomainSpec struct {
4444
zms.SignedDomain `json:",inline"`
4545
}

pkg/client/clientset/versioned/clientset.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/client/clientset/versioned/fake/clientset_generated.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/client/clientset/versioned/fake/register.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/client/clientset/versioned/scheme/register.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/client/clientset/versioned/typed/athenz/v1/athenz_client.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)