Skip to content

Commit 35c6833

Browse files
authored
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
1 parent e767b15 commit 35c6833

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+718
-1074
lines changed

.github/workflows/crdgen.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,7 @@ jobs:
2626
run: make -C crd/nodenetworkconfig
2727
- name: Regenerate MultitenantNetworkContainer CRD
2828
run: make -C crd/multitenantnetworkcontainer
29-
- name: Regenerate PodNetworkInstance CRD
30-
run: make -C crd/external/podnetworkinstance
31-
- name: Regenerate PodNetwork CRD
32-
run: make -C crd/external/podnetwork
33-
- name: Regenerate NodeInfo CRD
34-
run: make -C crd/nodeinfo
35-
- name: Regenerate MultitenantPodNetworkConfig CRD
36-
run: make -C crd/multitenantpodnetworkconfig
29+
- name: Regenerate Multitenancy CRDs
30+
run: make -C crd/multitenancy
3731
- name: Fail if the tree is dirty
3832
run: test -z "$(git status --porcelain)"

crd/external/podnetwork/Makefile

Lines changed: 0 additions & 19 deletions
This file was deleted.

crd/external/podnetwork/README.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

crd/external/podnetwork/api/v1alpha1/groupversion_info.go

Lines changed: 0 additions & 23 deletions
This file was deleted.

crd/external/podnetwork/api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 103 deletions
This file was deleted.

crd/external/podnetwork/client.go

Lines changed: 0 additions & 84 deletions
This file was deleted.

crd/external/podnetwork/embed.go

Lines changed: 0 additions & 24 deletions
This file was deleted.

crd/external/podnetwork/embed_test.go

Lines changed: 0 additions & 21 deletions
This file was deleted.

crd/external/podnetworkinstance/Makefile

Lines changed: 0 additions & 19 deletions
This file was deleted.

crd/external/podnetworkinstance/README.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)