Ankaggar/consolidate crds (#2171)

* organise related swiftv2 CRDs in same GV package * fix linter error * update crdgen * consolidate external swiftv2 crds * fix manifests * more changes * update crdgen * resolve merge conflicts * fix crdgen check failure * further flatten swiftv2 crds * fix UT failure
Azure · Aug 23, 2023 · 35c6833 · 35c6833
1 parent e767b15
commit 35c6833
Show file tree

Hide file tree

Showing 46 changed files with 718 additions and 1,074 deletions.
diff --git a/.github/workflows/crdgen.yaml b/.github/workflows/crdgen.yaml
@@ -26,13 +26,7 @@ jobs:
       run: make -C crd/nodenetworkconfig
     - name: Regenerate MultitenantNetworkContainer CRD
       run: make -C crd/multitenantnetworkcontainer
-    - name: Regenerate PodNetworkInstance CRD
-      run: make -C crd/external/podnetworkinstance
-    - name: Regenerate PodNetwork CRD
-      run: make -C crd/external/podnetwork
-    - name: Regenerate NodeInfo CRD
-      run: make -C crd/nodeinfo
-    - name: Regenerate MultitenantPodNetworkConfig CRD
-      run: make -C crd/multitenantpodnetworkconfig
+    - name: Regenerate Multitenancy CRDs
+      run: make -C crd/multitenancy
     - name: Fail if the tree is dirty
       run: test -z "$(git status --porcelain)"
diff --git a/crd/external/podnetwork/Makefile b/crd/external/podnetwork/Makefile
diff --git a/crd/external/podnetwork/README.md b/crd/external/podnetwork/README.md
diff --git a/crd/external/podnetwork/api/v1alpha1/groupversion_info.go b/crd/external/podnetwork/api/v1alpha1/groupversion_info.go
diff --git a/crd/external/podnetwork/api/v1alpha1/zz_generated.deepcopy.go b/crd/external/podnetwork/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/crd/external/podnetwork/client.go b/crd/external/podnetwork/client.go
diff --git a/crd/external/podnetwork/embed.go b/crd/external/podnetwork/embed.go
diff --git a/crd/external/podnetwork/embed_test.go b/crd/external/podnetwork/embed_test.go
diff --git a/crd/external/podnetworkinstance/Makefile b/crd/external/podnetworkinstance/Makefile
diff --git a/crd/external/podnetworkinstance/README.md b/crd/external/podnetworkinstance/README.md
diff --git a/crd/external/podnetworkinstance/api/v1alpha1/groupversion_info.go b/crd/external/podnetworkinstance/api/v1alpha1/groupversion_info.go