Merge pull request vmware-tanzu#884 from zhengxiexie/topic/zhengxie/m…

…ain/generated Add `make generated` in github ci
gran-vmv · Nov 13, 2024 · 673d2e7 · 673d2e7
2 parents 7d0d711 + 4143818
commit 673d2e7
Show file tree

Hide file tree

Showing 13 changed files with 508 additions and 2 deletions.
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
@@ -24,7 +24,10 @@ jobs:
 
     - name: Run golangci-lint
       run: make golangci
-
+
+    - name: Run code-generator
+      run: make generated
+
     - name: Run build
       run: make build
 

diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -12,6 +12,7 @@ GROUP=vpc
 SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 CODEGEN_PKG=$(go env GOMODCACHE)/k8s.io/[email protected]
 
+mv ./pkg/client/go.mod client.go.mod
 rm -fr ./pkg/client
 
 bash "${CODEGEN_PKG}"/generate-groups.sh "deepcopy,client,informer,lister" \
@@ -22,7 +23,7 @@ ${GROUP}:v1alpha1 \
 
 mv ./${OUTPUT_PKG} ./pkg/
 cd ./pkg/client
-go mod init github.com/vmware-tanzu/nsx-operator/pkg/client
+mv ../../client.go.mod ./go.mod
 go mod tidy
 cd ../../
 rm -rf ./github.com
diff --git a/pkg/client/clientset/versioned/typed/vpc/v1alpha1/fake/fake_subnetconnectionbindingmap.go b/pkg/client/clientset/versioned/typed/vpc/v1alpha1/fake/fake_subnetconnectionbindingmap.go
diff --git a/pkg/client/clientset/versioned/typed/vpc/v1alpha1/fake/fake_vpc_client.go b/pkg/client/clientset/versioned/typed/vpc/v1alpha1/fake/fake_vpc_client.go
diff --git a/pkg/client/clientset/versioned/typed/vpc/v1alpha1/generated_expansion.go b/pkg/client/clientset/versioned/typed/vpc/v1alpha1/generated_expansion.go
diff --git a/pkg/client/clientset/versioned/typed/vpc/v1alpha1/subnetconnectionbindingmap.go b/pkg/client/clientset/versioned/typed/vpc/v1alpha1/subnetconnectionbindingmap.go
diff --git a/pkg/client/clientset/versioned/typed/vpc/v1alpha1/vpc_client.go b/pkg/client/clientset/versioned/typed/vpc/v1alpha1/vpc_client.go
diff --git a/pkg/client/go.mod b/pkg/client/go.mod
@@ -19,6 +19,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect

diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go