From 043dc82a94721e9c5b2e50bf9be4a5fb9482d9d5 Mon Sep 17 00:00:00 2001 From: Hongliang Liu Date: Fri, 29 Jan 2021 15:26:57 +0800 Subject: [PATCH] Rename extension APIs from *.antrea.tanzu.vmware.com to *.antrea.io Extension APIs are renamed from *.antrea.tanzu.vmware.com to *.antrea.io, not including CRD APIs. Renamed extension APIs are: - v1alpha1.stats.antrea.io - v1beta1.system.antrea.io - v1beta2.controlplane.antrea.io Legacy extension APIs below are reserved. - v1alpha1.stats.antrea.io - v1beta1.system.antrea.io - v1beta2.controlplane.antrea.io - v1beta1.controlplane.antrea.io - v1beta1.networking.antrea.io --- build/yamls/antrea-aks.yml | 34 - build/yamls/antrea-eks.yml | 34 - build/yamls/antrea-gke.yml | 34 - build/yamls/antrea-ipsec.yml | 34 - build/yamls/antrea.yml | 34 - build/yamls/base/agent-rbac.yml | 1 - build/yamls/base/antctl.yml | 1 - build/yamls/base/controller-rbac.yml | 2 - build/yamls/base/controller.yml | 26 - hack/update-codegen-dockerized.sh | 10 +- pkg/apis/controlplane/install/install.go | 4 +- pkg/apis/controlplane/v1beta1/doc.go | 22 - pkg/apis/controlplane/v1beta1/register.go | 58 -- .../controlplane/v1beta1/conversion.go | 0 .../controlplane/v1beta1/conversion_test.go | 0 .../controlplane/v1beta1/generated.pb.go | 311 +++---- .../controlplane/v1beta1/generated.proto | 4 +- .../controlplane/v1beta1/helper.go | 0 .../legacy/controlplane/v1beta1/register.go | 20 +- .../{ => legacy}/controlplane/v1beta1/sets.go | 0 .../controlplane/v1beta1/types.go | 0 .../v1beta1/zz_generated.conversion.go | 2 +- .../v1beta1/zz_generated.deepcopy.go | 2 +- .../legacy/networking/v1beta1/register.go | 2 +- pkg/apis/legacy/stats/v1alpha1/register.go | 3 +- pkg/apis/networking/doc.go | 20 - pkg/apis/networking/install/install.go | 30 - pkg/apis/networking/register.go | 60 -- pkg/apis/networking/v1beta1/conversion.go | 46 - pkg/apis/networking/v1beta1/doc.go | 16 - pkg/apis/networking/v1beta1/register.go | 57 -- pkg/apiserver/apiserver.go | 38 +- .../certificate/cacert_controller.go | 4 +- pkg/apiserver/openapi/zz_generated.openapi.go | 856 +++++++++--------- .../clientset/versioned/fake/register.go | 4 +- .../clientset/versioned/scheme/register.go | 4 +- .../controlplane/v1beta1/addressgroup.go | 4 +- .../controlplane/v1beta1/appliedtogroup.go | 4 +- .../v1beta1/controlplane_client.go | 4 +- .../v1beta1/fake/fake_addressgroup.go | 4 +- .../v1beta1/fake/fake_appliedtogroup.go | 4 +- .../v1beta1/fake/fake_networkpolicy.go | 4 +- .../v1beta1/fake/fake_nodestatssummary.go | 4 +- .../controlplane/v1beta1/networkpolicy.go | 4 +- .../controlplane/v1beta1/nodestatssummary.go | 4 +- 45 files changed, 644 insertions(+), 1165 deletions(-) delete mode 100644 pkg/apis/controlplane/v1beta1/doc.go delete mode 100644 pkg/apis/controlplane/v1beta1/register.go rename pkg/apis/{ => legacy}/controlplane/v1beta1/conversion.go (100%) rename pkg/apis/{ => legacy}/controlplane/v1beta1/conversion_test.go (100%) rename pkg/apis/{ => legacy}/controlplane/v1beta1/generated.pb.go (91%) rename pkg/apis/{ => legacy}/controlplane/v1beta1/generated.proto (98%) rename pkg/apis/{ => legacy}/controlplane/v1beta1/helper.go (100%) rename pkg/apis/{ => legacy}/controlplane/v1beta1/sets.go (100%) rename pkg/apis/{ => legacy}/controlplane/v1beta1/types.go (100%) rename pkg/apis/{ => legacy}/controlplane/v1beta1/zz_generated.conversion.go (99%) rename pkg/apis/{ => legacy}/controlplane/v1beta1/zz_generated.deepcopy.go (99%) delete mode 100644 pkg/apis/networking/doc.go delete mode 100644 pkg/apis/networking/install/install.go delete mode 100644 pkg/apis/networking/register.go delete mode 100644 pkg/apis/networking/v1beta1/conversion.go delete mode 100644 pkg/apis/networking/v1beta1/doc.go delete mode 100644 pkg/apis/networking/v1beta1/register.go diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml index 783d59ae7ed..20e75b38dda 100644 --- a/build/yamls/antrea-aks.yml +++ b/build/yamls/antrea-aks.yml @@ -893,7 +893,6 @@ rules: - controlplane.antrea.tanzu.vmware.com - networking.antrea.tanzu.vmware.com - controlplane.antrea.io - - networking.antrea.io resources: - networkpolicies - appliedtogroups @@ -992,7 +991,6 @@ rules: - controlplane.antrea.tanzu.vmware.com - networking.antrea.tanzu.vmware.com - controlplane.antrea.io - - networking.antrea.io resources: - networkpolicies - appliedtogroups @@ -1145,8 +1143,6 @@ rules: - v1alpha1.stats.antrea.io - v1beta1.system.antrea.io - v1beta2.controlplane.antrea.io - - v1beta1.controlplane.antrea.io - - v1beta1.networking.antrea.io resources: - apiservices verbs: @@ -1597,21 +1593,6 @@ spec: --- apiVersion: apiregistration.k8s.io/v1 kind: APIService -metadata: - labels: - app: antrea - name: v1beta1.controlplane.antrea.io -spec: - group: controlplane.antrea.io - groupPriorityMinimum: 100 - service: - name: antrea - namespace: kube-system - version: v1beta1 - versionPriority: 100 ---- -apiVersion: apiregistration.k8s.io/v1 -kind: APIService metadata: labels: app: antrea @@ -1627,21 +1608,6 @@ spec: --- apiVersion: apiregistration.k8s.io/v1 kind: APIService -metadata: - labels: - app: antrea - name: v1beta1.networking.antrea.io -spec: - group: networking.antrea.io - groupPriorityMinimum: 100 - service: - name: antrea - namespace: kube-system - version: v1beta1 - versionPriority: 100 ---- -apiVersion: apiregistration.k8s.io/v1 -kind: APIService metadata: labels: app: antrea diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml index b18ae6d4873..03a09311a85 100644 --- a/build/yamls/antrea-eks.yml +++ b/build/yamls/antrea-eks.yml @@ -893,7 +893,6 @@ rules: - controlplane.antrea.tanzu.vmware.com - networking.antrea.tanzu.vmware.com - controlplane.antrea.io - - networking.antrea.io resources: - networkpolicies - appliedtogroups @@ -992,7 +991,6 @@ rules: - controlplane.antrea.tanzu.vmware.com - networking.antrea.tanzu.vmware.com - controlplane.antrea.io - - networking.antrea.io resources: - networkpolicies - appliedtogroups @@ -1145,8 +1143,6 @@ rules: - v1alpha1.stats.antrea.io - v1beta1.system.antrea.io - v1beta2.controlplane.antrea.io - - v1beta1.controlplane.antrea.io - - v1beta1.networking.antrea.io resources: - apiservices verbs: @@ -1597,21 +1593,6 @@ spec: --- apiVersion: apiregistration.k8s.io/v1 kind: APIService -metadata: - labels: - app: antrea - name: v1beta1.controlplane.antrea.io -spec: - group: controlplane.antrea.io - groupPriorityMinimum: 100 - service: - name: antrea - namespace: kube-system - version: v1beta1 - versionPriority: 100 ---- -apiVersion: apiregistration.k8s.io/v1 -kind: APIService metadata: labels: app: antrea @@ -1627,21 +1608,6 @@ spec: --- apiVersion: apiregistration.k8s.io/v1 kind: APIService -metadata: - labels: - app: antrea - name: v1beta1.networking.antrea.io -spec: - group: networking.antrea.io - groupPriorityMinimum: 100 - service: - name: antrea - namespace: kube-system - version: v1beta1 - versionPriority: 100 ---- -apiVersion: apiregistration.k8s.io/v1 -kind: APIService metadata: labels: app: antrea diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml index 8017941f111..e59f1e5c260 100644 --- a/build/yamls/antrea-gke.yml +++ b/build/yamls/antrea-gke.yml @@ -893,7 +893,6 @@ rules: - controlplane.antrea.tanzu.vmware.com - networking.antrea.tanzu.vmware.com - controlplane.antrea.io - - networking.antrea.io resources: - networkpolicies - appliedtogroups @@ -992,7 +991,6 @@ rules: - controlplane.antrea.tanzu.vmware.com - networking.antrea.tanzu.vmware.com - controlplane.antrea.io - - networking.antrea.io resources: - networkpolicies - appliedtogroups @@ -1145,8 +1143,6 @@ rules: - v1alpha1.stats.antrea.io - v1beta1.system.antrea.io - v1beta2.controlplane.antrea.io - - v1beta1.controlplane.antrea.io - - v1beta1.networking.antrea.io resources: - apiservices verbs: @@ -1597,21 +1593,6 @@ spec: --- apiVersion: apiregistration.k8s.io/v1 kind: APIService -metadata: - labels: - app: antrea - name: v1beta1.controlplane.antrea.io -spec: - group: controlplane.antrea.io - groupPriorityMinimum: 100 - service: - name: antrea - namespace: kube-system - version: v1beta1 - versionPriority: 100 ---- -apiVersion: apiregistration.k8s.io/v1 -kind: APIService metadata: labels: app: antrea @@ -1627,21 +1608,6 @@ spec: --- apiVersion: apiregistration.k8s.io/v1 kind: APIService -metadata: - labels: - app: antrea - name: v1beta1.networking.antrea.io -spec: - group: networking.antrea.io - groupPriorityMinimum: 100 - service: - name: antrea - namespace: kube-system - version: v1beta1 - versionPriority: 100 ---- -apiVersion: apiregistration.k8s.io/v1 -kind: APIService metadata: labels: app: antrea diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml index 7b859ee2de1..03e3c75576d 100644 --- a/build/yamls/antrea-ipsec.yml +++ b/build/yamls/antrea-ipsec.yml @@ -893,7 +893,6 @@ rules: - controlplane.antrea.tanzu.vmware.com - networking.antrea.tanzu.vmware.com - controlplane.antrea.io - - networking.antrea.io resources: - networkpolicies - appliedtogroups @@ -992,7 +991,6 @@ rules: - controlplane.antrea.tanzu.vmware.com - networking.antrea.tanzu.vmware.com - controlplane.antrea.io - - networking.antrea.io resources: - networkpolicies - appliedtogroups @@ -1145,8 +1143,6 @@ rules: - v1alpha1.stats.antrea.io - v1beta1.system.antrea.io - v1beta2.controlplane.antrea.io - - v1beta1.controlplane.antrea.io - - v1beta1.networking.antrea.io resources: - apiservices verbs: @@ -1611,21 +1607,6 @@ spec: --- apiVersion: apiregistration.k8s.io/v1 kind: APIService -metadata: - labels: - app: antrea - name: v1beta1.controlplane.antrea.io -spec: - group: controlplane.antrea.io - groupPriorityMinimum: 100 - service: - name: antrea - namespace: kube-system - version: v1beta1 - versionPriority: 100 ---- -apiVersion: apiregistration.k8s.io/v1 -kind: APIService metadata: labels: app: antrea @@ -1641,21 +1622,6 @@ spec: --- apiVersion: apiregistration.k8s.io/v1 kind: APIService -metadata: - labels: - app: antrea - name: v1beta1.networking.antrea.io -spec: - group: networking.antrea.io - groupPriorityMinimum: 100 - service: - name: antrea - namespace: kube-system - version: v1beta1 - versionPriority: 100 ---- -apiVersion: apiregistration.k8s.io/v1 -kind: APIService metadata: labels: app: antrea diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml index b278a9d6435..d942f094b8f 100644 --- a/build/yamls/antrea.yml +++ b/build/yamls/antrea.yml @@ -893,7 +893,6 @@ rules: - controlplane.antrea.tanzu.vmware.com - networking.antrea.tanzu.vmware.com - controlplane.antrea.io - - networking.antrea.io resources: - networkpolicies - appliedtogroups @@ -992,7 +991,6 @@ rules: - controlplane.antrea.tanzu.vmware.com - networking.antrea.tanzu.vmware.com - controlplane.antrea.io - - networking.antrea.io resources: - networkpolicies - appliedtogroups @@ -1145,8 +1143,6 @@ rules: - v1alpha1.stats.antrea.io - v1beta1.system.antrea.io - v1beta2.controlplane.antrea.io - - v1beta1.controlplane.antrea.io - - v1beta1.networking.antrea.io resources: - apiservices verbs: @@ -1602,21 +1598,6 @@ spec: --- apiVersion: apiregistration.k8s.io/v1 kind: APIService -metadata: - labels: - app: antrea - name: v1beta1.controlplane.antrea.io -spec: - group: controlplane.antrea.io - groupPriorityMinimum: 100 - service: - name: antrea - namespace: kube-system - version: v1beta1 - versionPriority: 100 ---- -apiVersion: apiregistration.k8s.io/v1 -kind: APIService metadata: labels: app: antrea @@ -1632,21 +1613,6 @@ spec: --- apiVersion: apiregistration.k8s.io/v1 kind: APIService -metadata: - labels: - app: antrea - name: v1beta1.networking.antrea.io -spec: - group: networking.antrea.io - groupPriorityMinimum: 100 - service: - name: antrea - namespace: kube-system - version: v1beta1 - versionPriority: 100 ---- -apiVersion: apiregistration.k8s.io/v1 -kind: APIService metadata: labels: app: antrea diff --git a/build/yamls/base/agent-rbac.yml b/build/yamls/base/agent-rbac.yml index 8e436cbdaac..02f8e8a3adb 100644 --- a/build/yamls/base/agent-rbac.yml +++ b/build/yamls/base/agent-rbac.yml @@ -49,7 +49,6 @@ rules: - controlplane.antrea.tanzu.vmware.com - networking.antrea.tanzu.vmware.com - controlplane.antrea.io - - networking.antrea.io resources: - networkpolicies - appliedtogroups diff --git a/build/yamls/base/antctl.yml b/build/yamls/base/antctl.yml index b8c176b3a1b..199a60aaac1 100644 --- a/build/yamls/base/antctl.yml +++ b/build/yamls/base/antctl.yml @@ -14,7 +14,6 @@ rules: - controlplane.antrea.tanzu.vmware.com - networking.antrea.tanzu.vmware.com - controlplane.antrea.io - - networking.antrea.io resources: - networkpolicies - appliedtogroups diff --git a/build/yamls/base/controller-rbac.yml b/build/yamls/base/controller-rbac.yml index 12ea2a92d42..35a12b8b545 100644 --- a/build/yamls/base/controller-rbac.yml +++ b/build/yamls/base/controller-rbac.yml @@ -94,8 +94,6 @@ rules: - v1alpha1.stats.antrea.io - v1beta1.system.antrea.io - v1beta2.controlplane.antrea.io - - v1beta1.controlplane.antrea.io - - v1beta1.networking.antrea.io verbs: - get - update diff --git a/build/yamls/base/controller.yml b/build/yamls/base/controller.yml index d95d571a49d..936316ae531 100644 --- a/build/yamls/base/controller.yml +++ b/build/yamls/base/controller.yml @@ -55,19 +55,6 @@ spec: name: antrea namespace: kube-system --- -apiVersion: apiregistration.k8s.io/v1 -kind: APIService -metadata: - name: v1beta1.controlplane.antrea.io -spec: - group: controlplane.antrea.io - groupPriorityMinimum: 100 - version: v1beta1 - versionPriority: 100 - service: - name: antrea - namespace: kube-system ---- # Deprecated in v0.10, planned for removal in v0.12. apiVersion: apiregistration.k8s.io/v1 kind: APIService @@ -84,19 +71,6 @@ spec: --- apiVersion: apiregistration.k8s.io/v1 kind: APIService -metadata: - name: v1beta1.networking.antrea.io -spec: - group: networking.antrea.io - groupPriorityMinimum: 100 - version: v1beta1 - versionPriority: 100 - service: - name: antrea - namespace: kube-system ---- -apiVersion: apiregistration.k8s.io/v1 -kind: APIService metadata: name: v1beta1.system.antrea.tanzu.vmware.com spec: diff --git a/hack/update-codegen-dockerized.sh b/hack/update-codegen-dockerized.sh index 161c72182e8..f322398d3b5 100755 --- a/hack/update-codegen-dockerized.sh +++ b/hack/update-codegen-dockerized.sh @@ -30,7 +30,7 @@ $GOPATH/bin/client-gen \ --clientset-name versioned \ --input-base "${ANTREA_PKG}/pkg/apis/" \ --input "clusterinformation/v1beta1" \ - --input "controlplane/v1beta1" \ + --input "legacy/controlplane/v1beta1" \ --input "controlplane/v1beta2" \ --input "system/v1beta1" \ --input "security/v1alpha1" \ @@ -64,7 +64,7 @@ $GOPATH/bin/informer-gen \ $GOPATH/bin/deepcopy-gen \ --input-dirs "${ANTREA_PKG}/pkg/apis/clusterinformation/v1beta1" \ --input-dirs "${ANTREA_PKG}/pkg/apis/controlplane" \ - --input-dirs "${ANTREA_PKG}/pkg/apis/controlplane/v1beta1" \ + --input-dirs "${ANTREA_PKG}/pkg/apis/legacy/controlplane/v1beta1" \ --input-dirs "${ANTREA_PKG}/pkg/apis/controlplane/v1beta2" \ --input-dirs "${ANTREA_PKG}/pkg/apis/system/v1beta1" \ --input-dirs "${ANTREA_PKG}/pkg/apis/security/v1alpha1" \ @@ -76,13 +76,13 @@ $GOPATH/bin/deepcopy-gen \ --go-header-file hack/boilerplate/license_header.go.txt $GOPATH/bin/conversion-gen \ - --input-dirs "${ANTREA_PKG}/pkg/apis/controlplane/v1beta2,${ANTREA_PKG}/pkg/apis/controlplane/v1beta1,${ANTREA_PKG}/pkg/apis/controlplane/" \ + --input-dirs "${ANTREA_PKG}/pkg/apis/controlplane/v1beta2,${ANTREA_PKG}/pkg/apis/legacy/controlplane/v1beta1,${ANTREA_PKG}/pkg/apis/controlplane/" \ --input-dirs "${ANTREA_PKG}/pkg/apis/stats/v1alpha1,${ANTREA_PKG}/pkg/apis/stats/" \ -O zz_generated.conversion \ --go-header-file hack/boilerplate/license_header.go.txt $GOPATH/bin/openapi-gen \ - --input-dirs "${ANTREA_PKG}/pkg/apis/controlplane/v1beta1" \ + --input-dirs "${ANTREA_PKG}/pkg/apis/legacy/controlplane/v1beta1" \ --input-dirs "${ANTREA_PKG}/pkg/apis/controlplane/v1beta2" \ --input-dirs "${ANTREA_PKG}/pkg/apis/clusterinformation/v1beta1" \ --input-dirs "${ANTREA_PKG}/pkg/apis/system/v1beta1" \ @@ -140,7 +140,7 @@ go mod vendor mv vendor /tmp/includes $GOPATH/bin/go-to-protobuf \ --proto-import /tmp/includes \ - --packages "${ANTREA_PKG}/pkg/apis/stats/v1alpha1,${ANTREA_PKG}/pkg/apis/controlplane/v1beta1,${ANTREA_PKG}/pkg/apis/controlplane/v1beta2" \ + --packages "${ANTREA_PKG}/pkg/apis/stats/v1alpha1,${ANTREA_PKG}/pkg/apis/legacy/controlplane/v1beta1,${ANTREA_PKG}/pkg/apis/controlplane/v1beta2" \ --go-header-file hack/boilerplate/license_header.go.txt rm -rf /tmp/includes diff --git a/pkg/apis/controlplane/install/install.go b/pkg/apis/controlplane/install/install.go index e39eb5be6c7..a4c33b9c32f 100644 --- a/pkg/apis/controlplane/install/install.go +++ b/pkg/apis/controlplane/install/install.go @@ -19,14 +19,12 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "github.com/vmware-tanzu/antrea/pkg/apis/controlplane" - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1" "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2" ) // Install registers the API group and adds types to a scheme func Install(scheme *runtime.Scheme) { utilruntime.Must(controlplane.AddToScheme(scheme)) - utilruntime.Must(v1beta1.AddToScheme(scheme)) utilruntime.Must(v1beta2.AddToScheme(scheme)) - utilruntime.Must(scheme.SetVersionPriority(v1beta2.SchemeGroupVersion, v1beta1.SchemeGroupVersion)) + utilruntime.Must(scheme.SetVersionPriority(v1beta2.SchemeGroupVersion)) } diff --git a/pkg/apis/controlplane/v1beta1/doc.go b/pkg/apis/controlplane/v1beta1/doc.go deleted file mode 100644 index 73fe4910483..00000000000 --- a/pkg/apis/controlplane/v1beta1/doc.go +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2019 Antrea Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// +k8s:openapi-gen=true -// +k8s:deepcopy-gen=package -// +k8s:protobuf-gen=package -// +k8s:conversion-gen=github.com/vmware-tanzu/antrea/pkg/apis/controlplane -// +groupName=controlplane.antrea.tanzu.vmware.com - -// Package v1beta1 is the v1beta1 version of the Antrea NetworkPolicy API messages. -package v1beta1 diff --git a/pkg/apis/controlplane/v1beta1/register.go b/pkg/apis/controlplane/v1beta1/register.go deleted file mode 100644 index b9f9cba3873..00000000000 --- a/pkg/apis/controlplane/v1beta1/register.go +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright 2019 Antrea Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package v1beta1 - -import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" -) - -// GroupName is the group name used in this package. -const GroupName = "controlplane.antrea.io" - -var ( - // SchemeGroupVersion is group version used to register these objects. - SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"} -) - -// Resource takes an unqualified resource and returns a Group qualified GroupResource. -func Resource(resource string) schema.GroupResource { - return SchemeGroupVersion.WithResource(resource).GroupResource() -} - -var ( - SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) - localSchemeBuilder = &SchemeBuilder - AddToScheme = localSchemeBuilder.AddToScheme -) - -// Adds the list of known types to the given scheme. -func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(SchemeGroupVersion, - &AppliedToGroup{}, - &AppliedToGroupPatch{}, - &AppliedToGroupList{}, - &AddressGroup{}, - &AddressGroupPatch{}, - &AddressGroupList{}, - &NetworkPolicy{}, - &NetworkPolicyList{}, - &NodeStatsSummary{}, - ) - - metav1.AddToGroupVersion(scheme, SchemeGroupVersion) - return nil -} diff --git a/pkg/apis/controlplane/v1beta1/conversion.go b/pkg/apis/legacy/controlplane/v1beta1/conversion.go similarity index 100% rename from pkg/apis/controlplane/v1beta1/conversion.go rename to pkg/apis/legacy/controlplane/v1beta1/conversion.go diff --git a/pkg/apis/controlplane/v1beta1/conversion_test.go b/pkg/apis/legacy/controlplane/v1beta1/conversion_test.go similarity index 100% rename from pkg/apis/controlplane/v1beta1/conversion_test.go rename to pkg/apis/legacy/controlplane/v1beta1/conversion_test.go diff --git a/pkg/apis/controlplane/v1beta1/generated.pb.go b/pkg/apis/legacy/controlplane/v1beta1/generated.pb.go similarity index 91% rename from pkg/apis/controlplane/v1beta1/generated.pb.go rename to pkg/apis/legacy/controlplane/v1beta1/generated.pb.go index 059a6ddfb48..979720e14a8 100644 --- a/pkg/apis/controlplane/v1beta1/generated.pb.go +++ b/pkg/apis/legacy/controlplane/v1beta1/generated.pb.go @@ -1,4 +1,4 @@ -// Copyright 2020 Antrea Authors +// Copyright 2021 Antrea Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1/generated.proto +// source: github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1/generated.proto package v1beta1 @@ -48,7 +48,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package func (m *AddressGroup) Reset() { *m = AddressGroup{} } func (*AddressGroup) ProtoMessage() {} func (*AddressGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{0} + return fileDescriptor_d29c22d7d484c7db, []int{0} } func (m *AddressGroup) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -76,7 +76,7 @@ var xxx_messageInfo_AddressGroup proto.InternalMessageInfo func (m *AddressGroupList) Reset() { *m = AddressGroupList{} } func (*AddressGroupList) ProtoMessage() {} func (*AddressGroupList) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{1} + return fileDescriptor_d29c22d7d484c7db, []int{1} } func (m *AddressGroupList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -104,7 +104,7 @@ var xxx_messageInfo_AddressGroupList proto.InternalMessageInfo func (m *AddressGroupPatch) Reset() { *m = AddressGroupPatch{} } func (*AddressGroupPatch) ProtoMessage() {} func (*AddressGroupPatch) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{2} + return fileDescriptor_d29c22d7d484c7db, []int{2} } func (m *AddressGroupPatch) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -132,7 +132,7 @@ var xxx_messageInfo_AddressGroupPatch proto.InternalMessageInfo func (m *AppliedToGroup) Reset() { *m = AppliedToGroup{} } func (*AppliedToGroup) ProtoMessage() {} func (*AppliedToGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{3} + return fileDescriptor_d29c22d7d484c7db, []int{3} } func (m *AppliedToGroup) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -160,7 +160,7 @@ var xxx_messageInfo_AppliedToGroup proto.InternalMessageInfo func (m *AppliedToGroupList) Reset() { *m = AppliedToGroupList{} } func (*AppliedToGroupList) ProtoMessage() {} func (*AppliedToGroupList) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{4} + return fileDescriptor_d29c22d7d484c7db, []int{4} } func (m *AppliedToGroupList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -188,7 +188,7 @@ var xxx_messageInfo_AppliedToGroupList proto.InternalMessageInfo func (m *AppliedToGroupPatch) Reset() { *m = AppliedToGroupPatch{} } func (*AppliedToGroupPatch) ProtoMessage() {} func (*AppliedToGroupPatch) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{5} + return fileDescriptor_d29c22d7d484c7db, []int{5} } func (m *AppliedToGroupPatch) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -216,7 +216,7 @@ var xxx_messageInfo_AppliedToGroupPatch proto.InternalMessageInfo func (m *Endpoint) Reset() { *m = Endpoint{} } func (*Endpoint) ProtoMessage() {} func (*Endpoint) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{6} + return fileDescriptor_d29c22d7d484c7db, []int{6} } func (m *Endpoint) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -244,7 +244,7 @@ var xxx_messageInfo_Endpoint proto.InternalMessageInfo func (m *ExternalEntityReference) Reset() { *m = ExternalEntityReference{} } func (*ExternalEntityReference) ProtoMessage() {} func (*ExternalEntityReference) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{7} + return fileDescriptor_d29c22d7d484c7db, []int{7} } func (m *ExternalEntityReference) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -272,7 +272,7 @@ var xxx_messageInfo_ExternalEntityReference proto.InternalMessageInfo func (m *GroupMember) Reset() { *m = GroupMember{} } func (*GroupMember) ProtoMessage() {} func (*GroupMember) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{8} + return fileDescriptor_d29c22d7d484c7db, []int{8} } func (m *GroupMember) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -300,7 +300,7 @@ var xxx_messageInfo_GroupMember proto.InternalMessageInfo func (m *GroupMemberPod) Reset() { *m = GroupMemberPod{} } func (*GroupMemberPod) ProtoMessage() {} func (*GroupMemberPod) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{9} + return fileDescriptor_d29c22d7d484c7db, []int{9} } func (m *GroupMemberPod) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -328,7 +328,7 @@ var xxx_messageInfo_GroupMemberPod proto.InternalMessageInfo func (m *IPBlock) Reset() { *m = IPBlock{} } func (*IPBlock) ProtoMessage() {} func (*IPBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{10} + return fileDescriptor_d29c22d7d484c7db, []int{10} } func (m *IPBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -356,7 +356,7 @@ var xxx_messageInfo_IPBlock proto.InternalMessageInfo func (m *IPNet) Reset() { *m = IPNet{} } func (*IPNet) ProtoMessage() {} func (*IPNet) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{11} + return fileDescriptor_d29c22d7d484c7db, []int{11} } func (m *IPNet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -384,7 +384,7 @@ var xxx_messageInfo_IPNet proto.InternalMessageInfo func (m *NamedPort) Reset() { *m = NamedPort{} } func (*NamedPort) ProtoMessage() {} func (*NamedPort) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{12} + return fileDescriptor_d29c22d7d484c7db, []int{12} } func (m *NamedPort) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -412,7 +412,7 @@ var xxx_messageInfo_NamedPort proto.InternalMessageInfo func (m *NetworkPolicy) Reset() { *m = NetworkPolicy{} } func (*NetworkPolicy) ProtoMessage() {} func (*NetworkPolicy) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{13} + return fileDescriptor_d29c22d7d484c7db, []int{13} } func (m *NetworkPolicy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -440,7 +440,7 @@ var xxx_messageInfo_NetworkPolicy proto.InternalMessageInfo func (m *NetworkPolicyList) Reset() { *m = NetworkPolicyList{} } func (*NetworkPolicyList) ProtoMessage() {} func (*NetworkPolicyList) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{14} + return fileDescriptor_d29c22d7d484c7db, []int{14} } func (m *NetworkPolicyList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -468,7 +468,7 @@ var xxx_messageInfo_NetworkPolicyList proto.InternalMessageInfo func (m *NetworkPolicyPeer) Reset() { *m = NetworkPolicyPeer{} } func (*NetworkPolicyPeer) ProtoMessage() {} func (*NetworkPolicyPeer) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{15} + return fileDescriptor_d29c22d7d484c7db, []int{15} } func (m *NetworkPolicyPeer) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -496,7 +496,7 @@ var xxx_messageInfo_NetworkPolicyPeer proto.InternalMessageInfo func (m *NetworkPolicyReference) Reset() { *m = NetworkPolicyReference{} } func (*NetworkPolicyReference) ProtoMessage() {} func (*NetworkPolicyReference) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{16} + return fileDescriptor_d29c22d7d484c7db, []int{16} } func (m *NetworkPolicyReference) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -524,7 +524,7 @@ var xxx_messageInfo_NetworkPolicyReference proto.InternalMessageInfo func (m *NetworkPolicyRule) Reset() { *m = NetworkPolicyRule{} } func (*NetworkPolicyRule) ProtoMessage() {} func (*NetworkPolicyRule) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{17} + return fileDescriptor_d29c22d7d484c7db, []int{17} } func (m *NetworkPolicyRule) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -552,7 +552,7 @@ var xxx_messageInfo_NetworkPolicyRule proto.InternalMessageInfo func (m *NetworkPolicyStats) Reset() { *m = NetworkPolicyStats{} } func (*NetworkPolicyStats) ProtoMessage() {} func (*NetworkPolicyStats) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{18} + return fileDescriptor_d29c22d7d484c7db, []int{18} } func (m *NetworkPolicyStats) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -580,7 +580,7 @@ var xxx_messageInfo_NetworkPolicyStats proto.InternalMessageInfo func (m *NodeStatsSummary) Reset() { *m = NodeStatsSummary{} } func (*NodeStatsSummary) ProtoMessage() {} func (*NodeStatsSummary) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{19} + return fileDescriptor_d29c22d7d484c7db, []int{19} } func (m *NodeStatsSummary) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -608,7 +608,7 @@ var xxx_messageInfo_NodeStatsSummary proto.InternalMessageInfo func (m *PodReference) Reset() { *m = PodReference{} } func (*PodReference) ProtoMessage() {} func (*PodReference) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{20} + return fileDescriptor_d29c22d7d484c7db, []int{20} } func (m *PodReference) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -636,7 +636,7 @@ var xxx_messageInfo_PodReference proto.InternalMessageInfo func (m *Service) Reset() { *m = Service{} } func (*Service) ProtoMessage() {} func (*Service) Descriptor() ([]byte, []int) { - return fileDescriptor_345cd0a9074e5729, []int{21} + return fileDescriptor_d29c22d7d484c7db, []int{21} } func (m *Service) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -662,140 +662,141 @@ func (m *Service) XXX_DiscardUnknown() { var xxx_messageInfo_Service proto.InternalMessageInfo func init() { - proto.RegisterType((*AddressGroup)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.AddressGroup") - proto.RegisterType((*AddressGroupList)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.AddressGroupList") - proto.RegisterType((*AddressGroupPatch)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.AddressGroupPatch") - proto.RegisterType((*AppliedToGroup)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.AppliedToGroup") - proto.RegisterType((*AppliedToGroupList)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.AppliedToGroupList") - proto.RegisterType((*AppliedToGroupPatch)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.AppliedToGroupPatch") - proto.RegisterType((*Endpoint)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.Endpoint") - proto.RegisterType((*ExternalEntityReference)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.ExternalEntityReference") - proto.RegisterType((*GroupMember)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.GroupMember") - proto.RegisterType((*GroupMemberPod)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.GroupMemberPod") - proto.RegisterType((*IPBlock)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.IPBlock") - proto.RegisterType((*IPNet)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.IPNet") - proto.RegisterType((*NamedPort)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.NamedPort") - proto.RegisterType((*NetworkPolicy)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.NetworkPolicy") - proto.RegisterType((*NetworkPolicyList)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.NetworkPolicyList") - proto.RegisterType((*NetworkPolicyPeer)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.NetworkPolicyPeer") - proto.RegisterType((*NetworkPolicyReference)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.NetworkPolicyReference") - proto.RegisterType((*NetworkPolicyRule)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.NetworkPolicyRule") - proto.RegisterType((*NetworkPolicyStats)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.NetworkPolicyStats") - proto.RegisterType((*NodeStatsSummary)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.NodeStatsSummary") - proto.RegisterType((*PodReference)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.PodReference") - proto.RegisterType((*Service)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1.Service") + proto.RegisterType((*AddressGroup)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.AddressGroup") + proto.RegisterType((*AddressGroupList)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.AddressGroupList") + proto.RegisterType((*AddressGroupPatch)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.AddressGroupPatch") + proto.RegisterType((*AppliedToGroup)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.AppliedToGroup") + proto.RegisterType((*AppliedToGroupList)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.AppliedToGroupList") + proto.RegisterType((*AppliedToGroupPatch)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.AppliedToGroupPatch") + proto.RegisterType((*Endpoint)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.Endpoint") + proto.RegisterType((*ExternalEntityReference)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.ExternalEntityReference") + proto.RegisterType((*GroupMember)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.GroupMember") + proto.RegisterType((*GroupMemberPod)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.GroupMemberPod") + proto.RegisterType((*IPBlock)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.IPBlock") + proto.RegisterType((*IPNet)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.IPNet") + proto.RegisterType((*NamedPort)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.NamedPort") + proto.RegisterType((*NetworkPolicy)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.NetworkPolicy") + proto.RegisterType((*NetworkPolicyList)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.NetworkPolicyList") + proto.RegisterType((*NetworkPolicyPeer)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.NetworkPolicyPeer") + proto.RegisterType((*NetworkPolicyReference)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.NetworkPolicyReference") + proto.RegisterType((*NetworkPolicyRule)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.NetworkPolicyRule") + proto.RegisterType((*NetworkPolicyStats)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.NetworkPolicyStats") + proto.RegisterType((*NodeStatsSummary)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.NodeStatsSummary") + proto.RegisterType((*PodReference)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.PodReference") + proto.RegisterType((*Service)(nil), "github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1.Service") } func init() { - proto.RegisterFile("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1/generated.proto", fileDescriptor_345cd0a9074e5729) -} - -var fileDescriptor_345cd0a9074e5729 = []byte{ - // 1652 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xcd, 0x6f, 0x1b, 0x45, - 0x1b, 0xcf, 0xfa, 0x23, 0x89, 0x27, 0x76, 0x3e, 0x26, 0x6f, 0xdf, 0xfa, 0xed, 0x5b, 0xec, 0x74, - 0xe1, 0x90, 0x03, 0x5d, 0x37, 0xa5, 0x40, 0x25, 0xca, 0x21, 0x6e, 0xd2, 0xca, 0x90, 0xa6, 0xd6, - 0x24, 0xbd, 0x20, 0x24, 0xd8, 0xec, 0x8e, 0x9d, 0x6d, 0xd6, 0x3b, 0xdb, 0xd9, 0x71, 0xda, 0x20, - 0x81, 0xa8, 0x38, 0xd1, 0x0b, 0x5f, 0x17, 0x2e, 0x1c, 0x91, 0x10, 0xe2, 0x2f, 0xe0, 0xc6, 0xad, - 0xc7, 0x1e, 0x7b, 0xc1, 0x22, 0xae, 0xa8, 0xb8, 0x71, 0x8f, 0x84, 0x84, 0x66, 0x76, 0xf6, 0xcb, - 0x8e, 0xdb, 0x20, 0x3b, 0x11, 0x87, 0x9e, 0x92, 0x99, 0x79, 0xe6, 0xf9, 0xfd, 0xe6, 0x79, 0x9e, - 0xf9, 0xed, 0xb3, 0x6b, 0xb0, 0xd6, 0xb4, 0xd8, 0x76, 0x7b, 0x4b, 0x33, 0x48, 0xab, 0xb2, 0xdb, - 0xba, 0xab, 0x53, 0x7c, 0x9e, 0xe9, 0xce, 0x47, 0xed, 0x8a, 0xee, 0x30, 0x8a, 0xf5, 0x8a, 0xbb, - 0xd3, 0xac, 0xe8, 0xae, 0xe5, 0x55, 0x0c, 0xe2, 0x30, 0x4a, 0x6c, 0xd7, 0xd6, 0x1d, 0x5c, 0xd9, - 0x5d, 0xda, 0xc2, 0x4c, 0x5f, 0xaa, 0x34, 0xb1, 0x83, 0xa9, 0xce, 0xb0, 0xa9, 0xb9, 0x94, 0x30, - 0x02, 0xaf, 0x44, 0xde, 0x34, 0xdf, 0xdb, 0x07, 0xc2, 0x9b, 0xe6, 0x7b, 0xd3, 0xdc, 0x9d, 0xa6, - 0xc6, 0xbd, 0x69, 0x71, 0x6f, 0x9a, 0xf4, 0x76, 0xe6, 0x7c, 0x8c, 0x4b, 0x93, 0x34, 0x49, 0x45, - 0x38, 0xdd, 0x6a, 0x37, 0xc4, 0x48, 0x0c, 0xc4, 0x7f, 0x3e, 0xd8, 0x99, 0x6b, 0x47, 0xa5, 0xee, - 0x31, 0x9d, 0x79, 0x95, 0xdd, 0x25, 0xdd, 0x76, 0xb7, 0xfb, 0x49, 0x9f, 0xb9, 0xb4, 0x73, 0xd9, - 0xd3, 0x2c, 0xc2, 0x6d, 0x5b, 0xba, 0xb1, 0x6d, 0x39, 0x98, 0xee, 0x45, 0x9b, 0x5b, 0x98, 0xe9, - 0x95, 0xdd, 0xfe, 0x5d, 0x95, 0x41, 0xbb, 0x68, 0xdb, 0x61, 0x56, 0x0b, 0xf7, 0x6d, 0x78, 0xe3, - 0x79, 0x1b, 0x3c, 0x63, 0x1b, 0xb7, 0xf4, 0xbe, 0x7d, 0xaf, 0x0d, 0xda, 0xd7, 0x66, 0x96, 0x5d, - 0xb1, 0x1c, 0xe6, 0x31, 0xda, 0xbb, 0x49, 0x7d, 0x9a, 0x02, 0xf9, 0x65, 0xd3, 0xa4, 0xd8, 0xf3, - 0xae, 0x53, 0xd2, 0x76, 0xe1, 0x87, 0x60, 0x92, 0x9f, 0xc4, 0xd4, 0x99, 0x5e, 0x54, 0x16, 0x94, - 0xc5, 0xa9, 0x8b, 0x17, 0x34, 0xdf, 0xb1, 0x16, 0x77, 0x1c, 0x65, 0x88, 0x5b, 0x6b, 0xbb, 0x4b, - 0xda, 0xcd, 0xad, 0xdb, 0xd8, 0x60, 0x37, 0x30, 0xd3, 0xab, 0xf0, 0x61, 0xa7, 0x3c, 0xd6, 0xed, - 0x94, 0x41, 0x34, 0x87, 0x42, 0xaf, 0xd0, 0x01, 0x19, 0x97, 0x98, 0x5e, 0x31, 0xb5, 0x90, 0x5e, - 0x9c, 0xba, 0xb8, 0xa6, 0x0d, 0x53, 0x0a, 0x9a, 0x20, 0x7d, 0x03, 0xb7, 0xb6, 0x30, 0xad, 0x13, - 0xb3, 0x9a, 0x97, 0xc8, 0x99, 0x3a, 0x31, 0x3d, 0x24, 0x70, 0xe0, 0x67, 0x0a, 0xc8, 0x37, 0x23, - 0x33, 0xaf, 0x98, 0x16, 0xc0, 0xb5, 0x91, 0x01, 0x57, 0xff, 0x23, 0x51, 0xf3, 0xb1, 0x49, 0x0f, - 0x25, 0x40, 0xd5, 0x7d, 0x05, 0xcc, 0xc6, 0x03, 0xbd, 0x66, 0x79, 0x0c, 0xbe, 0xdf, 0x17, 0x6c, - 0xed, 0x68, 0xc1, 0xe6, 0xbb, 0x45, 0xa8, 0x67, 0x25, 0xf4, 0x64, 0x30, 0x13, 0x0b, 0x34, 0x01, - 0x59, 0x8b, 0xe1, 0x56, 0x10, 0xe9, 0x77, 0x86, 0x3b, 0x70, 0x9c, 0x7c, 0xb5, 0x20, 0x61, 0xb3, - 0x35, 0x0e, 0x80, 0x7c, 0x1c, 0xf5, 0xc7, 0x2c, 0x98, 0x8b, 0x9b, 0xd5, 0x75, 0x66, 0x6c, 0x9f, - 0x40, 0x45, 0x7d, 0x0c, 0x72, 0xba, 0x69, 0x62, 0xb3, 0x7e, 0x5c, 0x65, 0x35, 0x27, 0xe1, 0x73, - 0xcb, 0x01, 0x0c, 0x8a, 0x10, 0x79, 0x81, 0x4d, 0x51, 0xdc, 0x22, 0xbb, 0x92, 0x41, 0xfa, 0x18, - 0x18, 0xcc, 0x4b, 0x06, 0x53, 0x28, 0x02, 0x42, 0x71, 0x54, 0xf8, 0xb5, 0x02, 0xe6, 0x04, 0xa7, - 0x78, 0x11, 0x16, 0x33, 0xa3, 0xae, 0xf5, 0xff, 0x49, 0x22, 0x73, 0xcb, 0xbd, 0x58, 0xa8, 0x1f, - 0x1e, 0x7e, 0xab, 0x80, 0x79, 0x49, 0x32, 0x41, 0x2b, 0x3b, 0x6a, 0x5a, 0xff, 0x97, 0xb4, 0xe6, - 0x51, 0x3f, 0x1a, 0x3a, 0x8c, 0x82, 0xfa, 0x47, 0x0a, 0x4c, 0x2f, 0xbb, 0xae, 0x6d, 0x61, 0x73, - 0x93, 0xbc, 0xd0, 0xbe, 0xe3, 0xd4, 0xbe, 0xdf, 0x15, 0x00, 0x93, 0xa1, 0x3e, 0x01, 0xf5, 0xbb, - 0x93, 0x54, 0xbf, 0x21, 0x63, 0x9d, 0xa4, 0x3f, 0x40, 0xff, 0x7e, 0xca, 0x82, 0xf9, 0xa4, 0xe1, - 0x0b, 0x05, 0x7c, 0xa1, 0x80, 0xff, 0x5a, 0x05, 0xfc, 0x4e, 0x01, 0x93, 0xab, 0x8e, 0xe9, 0x12, - 0xcb, 0x61, 0xf0, 0x65, 0x90, 0xb2, 0x5c, 0x51, 0x9d, 0xf9, 0xea, 0x7c, 0xb7, 0x53, 0x4e, 0xd5, - 0xea, 0x07, 0x9d, 0x72, 0xae, 0x56, 0x97, 0x0f, 0x74, 0x94, 0xb2, 0x5c, 0x68, 0x83, 0xac, 0x4b, - 0x28, 0x0b, 0x4a, 0xec, 0xfa, 0x70, 0xec, 0xd7, 0xf5, 0x16, 0xcf, 0x1c, 0x65, 0xd1, 0x75, 0xe2, - 0x23, 0x0f, 0xf9, 0x20, 0xaa, 0x0d, 0x4e, 0xaf, 0xde, 0x63, 0x98, 0x3a, 0xba, 0xbd, 0xea, 0x30, - 0x8b, 0xed, 0x21, 0xdc, 0xc0, 0x14, 0x3b, 0x06, 0x86, 0x0b, 0x20, 0xe3, 0xe8, 0x2d, 0x2c, 0xf8, - 0xe6, 0x22, 0xe5, 0xe3, 0x1e, 0x91, 0x58, 0x81, 0x15, 0x90, 0xe3, 0x7f, 0x3d, 0x57, 0x37, 0x70, - 0x31, 0x25, 0xcc, 0xc2, 0x1a, 0x5e, 0x0f, 0x16, 0x50, 0x64, 0xa3, 0xde, 0x4f, 0x83, 0xa9, 0x58, - 0x78, 0x20, 0x06, 0x69, 0x97, 0x98, 0xf2, 0xbe, 0x0e, 0xd9, 0x3b, 0xd5, 0x89, 0x19, 0x72, 0xaf, - 0x4e, 0x74, 0x3b, 0xe5, 0x34, 0x9f, 0xe1, 0xfe, 0xe1, 0x57, 0x0a, 0x98, 0xc6, 0x89, 0x53, 0x0a, - 0xb6, 0x53, 0x17, 0x6f, 0x0d, 0x07, 0x39, 0x20, 0x72, 0x55, 0xd8, 0xed, 0x94, 0xa7, 0x7b, 0x16, - 0x7b, 0x08, 0xc0, 0xbb, 0x20, 0x87, 0x65, 0x5d, 0x04, 0x77, 0xf9, 0xda, 0x90, 0x6c, 0xa4, 0xbb, - 0x28, 0x07, 0xc1, 0x8c, 0x87, 0x22, 0x2c, 0xf5, 0x41, 0x0a, 0x4c, 0x27, 0xaf, 0xfd, 0x49, 0xa5, - 0xc1, 0x2f, 0xff, 0xd4, 0x11, 0xcb, 0x3f, 0x7d, 0x12, 0xe5, 0xff, 0xab, 0x02, 0x26, 0x6a, 0xf5, - 0xaa, 0x4d, 0x8c, 0x1d, 0x88, 0x41, 0xc6, 0xb0, 0x4c, 0x2a, 0xc3, 0x70, 0x75, 0x38, 0xe0, 0x5a, - 0x7d, 0x1d, 0xb3, 0xe8, 0xd2, 0x5c, 0xad, 0xad, 0x20, 0x24, 0xdc, 0xc3, 0x1d, 0x30, 0x8e, 0xef, - 0x19, 0xd8, 0x65, 0xf2, 0x82, 0x8f, 0x04, 0x68, 0x5a, 0x02, 0x8d, 0xaf, 0x0a, 0xd7, 0x48, 0x42, - 0xa8, 0x0d, 0x90, 0x15, 0x06, 0x47, 0x93, 0x9e, 0xcb, 0x20, 0xef, 0x52, 0xdc, 0xb0, 0xee, 0xad, - 0x61, 0xa7, 0xc9, 0xb6, 0x45, 0xaa, 0xb2, 0x51, 0xf7, 0x51, 0x8f, 0xad, 0xa1, 0x84, 0xa5, 0xfa, - 0xb9, 0x02, 0x72, 0x61, 0xac, 0xb9, 0x72, 0xf0, 0xf0, 0x0a, 0xb8, 0x6c, 0xbc, 0x67, 0xa2, 0x0c, - 0x89, 0x95, 0x50, 0x5b, 0x52, 0x03, 0xb5, 0xe5, 0x32, 0x98, 0x14, 0x6f, 0xcf, 0x06, 0xb1, 0x8b, - 0x69, 0x61, 0x75, 0x36, 0x68, 0x44, 0xea, 0x72, 0xfe, 0x20, 0xf6, 0x3f, 0x0a, 0xad, 0xd5, 0x07, - 0x19, 0x50, 0x58, 0xc7, 0xec, 0x2e, 0xa1, 0x3b, 0x75, 0x62, 0x5b, 0xc6, 0xde, 0x09, 0xf4, 0x06, - 0x0c, 0x64, 0x69, 0xdb, 0xc6, 0x81, 0x68, 0xdf, 0x1c, 0xb2, 0x6a, 0xe3, 0xec, 0x51, 0xdb, 0xc6, - 0x51, 0xf5, 0xf2, 0x91, 0x87, 0x7c, 0x30, 0xf8, 0x36, 0x98, 0xd1, 0x13, 0xad, 0x90, 0x7f, 0x6b, - 0x72, 0x22, 0xc3, 0x33, 0xc9, 0x2e, 0xc9, 0x43, 0xbd, 0xb6, 0x70, 0x91, 0x87, 0xd8, 0x22, 0x94, - 0xeb, 0x61, 0x66, 0x41, 0x59, 0x54, 0xaa, 0x79, 0x3f, 0xbc, 0xfe, 0x1c, 0x0a, 0x57, 0xe1, 0x25, - 0x90, 0x67, 0x16, 0xa6, 0xc1, 0x4a, 0x31, 0x2b, 0x12, 0x3b, 0xcb, 0x8b, 0x62, 0x33, 0x36, 0x8f, - 0x12, 0x56, 0xf0, 0xbe, 0x02, 0x72, 0x1e, 0x69, 0x53, 0x03, 0x23, 0xdc, 0x28, 0x8e, 0x8b, 0xc0, - 0x6f, 0x8e, 0x32, 0x32, 0xa1, 0xce, 0x14, 0xb8, 0xda, 0x6d, 0x04, 0x50, 0x28, 0x42, 0x55, 0x9f, - 0x28, 0x60, 0x2e, 0xb1, 0xe9, 0x04, 0xba, 0x62, 0x37, 0xd9, 0x15, 0xbf, 0x3b, 0xc2, 0x23, 0x0f, - 0x68, 0x8a, 0x7f, 0xe9, 0x3d, 0x65, 0x1d, 0x63, 0x0a, 0xdf, 0x04, 0x05, 0x3d, 0xf6, 0xa5, 0xc0, - 0x2b, 0x2a, 0xa2, 0x38, 0xe6, 0xba, 0x9d, 0x72, 0x21, 0xfe, 0x09, 0xc1, 0x43, 0x49, 0x3b, 0xe8, - 0x81, 0x49, 0xcb, 0x15, 0xa2, 0x18, 0x9c, 0x61, 0x75, 0x58, 0x91, 0x12, 0xde, 0xa2, 0xa8, 0xc9, - 0x09, 0x0f, 0x85, 0x40, 0xea, 0x53, 0x05, 0xfc, 0xf7, 0xf0, 0xf4, 0xc2, 0xd7, 0x41, 0x86, 0xed, - 0xb9, 0x41, 0x27, 0x72, 0x2e, 0x50, 0x8b, 0xcd, 0x3d, 0x17, 0x1f, 0x74, 0xca, 0xc9, 0x93, 0xf3, - 0x49, 0x24, 0xcc, 0xff, 0x71, 0x7b, 0x12, 0xaa, 0x52, 0x7a, 0xa0, 0x2a, 0x55, 0x41, 0xba, 0x6d, - 0x99, 0xe2, 0xb6, 0xe4, 0xaa, 0x17, 0xa4, 0x41, 0xfa, 0x56, 0x6d, 0xe5, 0xa0, 0x53, 0x3e, 0x37, - 0xe8, 0xdb, 0x20, 0x27, 0xe3, 0x69, 0xb7, 0x6a, 0x2b, 0x88, 0x6f, 0x56, 0xff, 0xca, 0xf4, 0x24, - 0x8b, 0xdf, 0x69, 0x78, 0x05, 0xe4, 0x4c, 0x8b, 0x62, 0x83, 0x59, 0xc4, 0x91, 0x07, 0x2d, 0x05, - 0x64, 0x57, 0x82, 0x85, 0x83, 0xf8, 0x00, 0x45, 0x1b, 0xe0, 0x1d, 0x90, 0x69, 0x50, 0xd2, 0x92, - 0x6d, 0xcd, 0x28, 0xe5, 0x87, 0x57, 0x52, 0x14, 0x8a, 0x6b, 0x94, 0xb4, 0x90, 0x80, 0x82, 0x3b, - 0x20, 0xc5, 0x88, 0x08, 0xd5, 0x31, 0x00, 0x02, 0x09, 0x98, 0xda, 0x24, 0x28, 0xc5, 0x08, 0xaf, - 0x48, 0x0f, 0xd3, 0x5d, 0xcb, 0xc0, 0xc1, 0xcb, 0xc6, 0x90, 0x15, 0xb9, 0xe1, 0x7b, 0x8b, 0x2a, - 0x52, 0x4e, 0x78, 0x28, 0x04, 0x82, 0xaf, 0xc6, 0xf4, 0x51, 0x2a, 0x5e, 0xf4, 0x08, 0xea, 0xd3, - 0xc8, 0xdb, 0x60, 0x5c, 0xf7, 0xb3, 0x37, 0x2e, 0xb2, 0x87, 0xf8, 0xe3, 0x78, 0x39, 0x48, 0xdb, - 0xca, 0x91, 0xbf, 0x8f, 0x63, 0xa3, 0xcd, 0xfd, 0x85, 0x9f, 0xc8, 0x35, 0x5e, 0x1e, 0xbe, 0x1f, - 0x24, 0x11, 0xe0, 0x5b, 0xa0, 0x80, 0x1d, 0x7d, 0xcb, 0xc6, 0x6b, 0xa4, 0xd9, 0xb4, 0x9c, 0x66, - 0x71, 0x62, 0x41, 0x59, 0x9c, 0xac, 0x9e, 0x92, 0xf4, 0x0a, 0xab, 0xf1, 0x45, 0x94, 0xb4, 0x55, - 0x7f, 0x48, 0x01, 0x98, 0x88, 0xf8, 0x06, 0xd3, 0x99, 0xc7, 0x9b, 0xe4, 0x82, 0x13, 0x9f, 0x96, - 0xca, 0x78, 0x3c, 0x8a, 0x1d, 0x52, 0x4d, 0xae, 0x27, 0x19, 0xc0, 0x4f, 0x40, 0x9e, 0x51, 0xbd, - 0xd1, 0xb0, 0x0c, 0xc1, 0x51, 0x96, 0xf7, 0xca, 0x91, 0x19, 0x89, 0x1f, 0x1b, 0xb4, 0x30, 0x92, - 0x9b, 0x31, 0x5f, 0x51, 0x5b, 0x13, 0x9f, 0x45, 0x09, 0x3c, 0xf5, 0xcf, 0x0c, 0x98, 0x5d, 0x27, - 0x26, 0x16, 0xa3, 0x8d, 0x76, 0xab, 0xa5, 0xd3, 0x93, 0xe8, 0x26, 0xbe, 0x51, 0xc0, 0x4c, 0x3c, - 0x10, 0x56, 0xd8, 0x58, 0xd4, 0x47, 0x98, 0x0c, 0x3f, 0x0c, 0xa7, 0x25, 0x93, 0x99, 0xf5, 0x24, - 0x20, 0xea, 0x65, 0x00, 0x7f, 0x56, 0xc0, 0x59, 0x1f, 0xe5, 0xaa, 0xdd, 0xf6, 0x18, 0xa6, 0x3d, - 0x3b, 0x64, 0xc7, 0x3e, 0x7a, 0x8a, 0xaf, 0x48, 0x8a, 0x67, 0x97, 0x9f, 0x81, 0x8e, 0x9e, 0xc9, - 0x0d, 0x7e, 0xaf, 0x80, 0x53, 0xbe, 0x41, 0x2f, 0xeb, 0xcc, 0x31, 0xb1, 0x7e, 0x49, 0xb2, 0x3e, - 0xb5, 0x7c, 0x18, 0x2c, 0x3a, 0x9c, 0x8d, 0xaa, 0x83, 0x7c, 0xfc, 0x0d, 0xea, 0x38, 0x5e, 0xc2, - 0xbf, 0x50, 0xc0, 0x84, 0x54, 0x3b, 0x78, 0x29, 0xd6, 0x65, 0xfb, 0x10, 0xc5, 0xe7, 0x77, 0xd8, - 0x70, 0x5d, 0xf6, 0xf7, 0xa9, 0xe7, 0x54, 0x7f, 0x9b, 0x59, 0xb6, 0xe6, 0xff, 0x28, 0xa6, 0xd5, - 0x1c, 0x76, 0x93, 0x6e, 0x30, 0x6a, 0x39, 0xcd, 0xea, 0x64, 0xf2, 0x6d, 0xa0, 0x7a, 0xfe, 0xe1, - 0x7e, 0x69, 0xec, 0xd1, 0x7e, 0x69, 0xec, 0xf1, 0x7e, 0x69, 0xec, 0xd3, 0x6e, 0x49, 0x79, 0xd8, - 0x2d, 0x29, 0x8f, 0xba, 0x25, 0xe5, 0x71, 0xb7, 0xa4, 0xfc, 0xd6, 0x2d, 0x29, 0x5f, 0x3e, 0x29, - 0x8d, 0xbd, 0x37, 0x21, 0x83, 0xfd, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe8, 0x1c, 0xc4, 0xa0, - 0x27, 0x1d, 0x00, 0x00, + proto.RegisterFile("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1/generated.proto", fileDescriptor_d29c22d7d484c7db) +} + +var fileDescriptor_d29c22d7d484c7db = []byte{ + // 1670 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xcf, 0x6f, 0xdb, 0x46, + 0x16, 0x36, 0xf5, 0xc3, 0xb6, 0xc6, 0x92, 0x7f, 0x8c, 0x37, 0x1b, 0x6d, 0x36, 0x2b, 0x39, 0xdc, + 0x3d, 0xf8, 0xb0, 0xa1, 0xe2, 0x6c, 0x76, 0x37, 0x40, 0xdb, 0x83, 0x15, 0x3b, 0x85, 0x0a, 0x47, + 0x51, 0xc7, 0x4e, 0x0b, 0xb4, 0x01, 0xda, 0x31, 0x39, 0x92, 0x19, 0x53, 0x1c, 0x62, 0x38, 0x52, + 0xec, 0x14, 0x08, 0x7a, 0xc8, 0xa1, 0xed, 0xa5, 0x45, 0x0f, 0x45, 0xda, 0x4b, 0x2f, 0x3d, 0x16, + 0xe8, 0xdf, 0xd0, 0x53, 0xdd, 0x5b, 0x8e, 0x39, 0x09, 0x8d, 0x0a, 0x14, 0x45, 0xdb, 0x63, 0xd1, + 0x83, 0x4f, 0x05, 0x87, 0x43, 0x91, 0x94, 0xac, 0xc4, 0x05, 0x24, 0x01, 0x05, 0x72, 0xb2, 0x39, + 0xf3, 0xe6, 0x7d, 0xdf, 0x7c, 0xf3, 0xe6, 0xf3, 0x23, 0x0d, 0xb6, 0x1b, 0x26, 0xdf, 0x6b, 0xed, + 0x6a, 0x3a, 0x6d, 0x96, 0xda, 0xcd, 0xbb, 0x98, 0x91, 0x8b, 0x1c, 0xdb, 0xf7, 0x5a, 0x25, 0x6c, + 0x73, 0x46, 0x70, 0xc9, 0xd9, 0x6f, 0x94, 0xb0, 0x63, 0xba, 0x25, 0x8b, 0x34, 0xb0, 0x7e, 0x58, + 0xd2, 0xa9, 0xcd, 0x19, 0xb5, 0x1c, 0x0b, 0xdb, 0xa4, 0xd4, 0x5e, 0xdb, 0x25, 0x1c, 0xaf, 0x95, + 0x1a, 0xc4, 0x26, 0x0c, 0x73, 0x62, 0x68, 0x0e, 0xa3, 0x9c, 0xc2, 0x6b, 0x61, 0x52, 0xcd, 0x4f, + 0xfa, 0x96, 0x48, 0xaa, 0xf9, 0x49, 0x35, 0x67, 0xbf, 0xa1, 0x79, 0x49, 0x35, 0x3f, 0xa9, 0x16, + 0x4d, 0xaa, 0xc9, 0xa4, 0xe7, 0x2e, 0x46, 0x98, 0x35, 0x68, 0x83, 0x96, 0x44, 0xee, 0xdd, 0x56, + 0x5d, 0x3c, 0x89, 0x07, 0xf1, 0x9b, 0x8f, 0x79, 0xee, 0xfa, 0x69, 0x37, 0xe2, 0x72, 0xcc, 0xdd, + 0x52, 0x7b, 0x0d, 0x5b, 0xce, 0xde, 0x20, 0xf7, 0x73, 0x57, 0xf6, 0xaf, 0xba, 0x9a, 0x49, 0xbd, + 0xd8, 0x26, 0xd6, 0xf7, 0x4c, 0x9b, 0xb0, 0xc3, 0x70, 0x71, 0x93, 0x70, 0x5c, 0x6a, 0x0f, 0xae, + 0x2a, 0x0d, 0x5b, 0xc5, 0x5a, 0x36, 0x37, 0x9b, 0x64, 0x60, 0xc1, 0xff, 0x9e, 0xb5, 0xc0, 0xd5, + 0xf7, 0x48, 0x13, 0x0f, 0xac, 0xfb, 0xcf, 0xb0, 0x75, 0x2d, 0x6e, 0x5a, 0x25, 0xd3, 0xe6, 0x2e, + 0x67, 0xfd, 0x8b, 0xd4, 0x5f, 0x13, 0x20, 0xbb, 0x6e, 0x18, 0x8c, 0xb8, 0xee, 0xcb, 0x8c, 0xb6, + 0x1c, 0xf8, 0x36, 0x98, 0xf5, 0x76, 0x62, 0x60, 0x8e, 0xf3, 0xca, 0x8a, 0xb2, 0x3a, 0x77, 0xf9, + 0x92, 0xe6, 0x27, 0xd6, 0xa2, 0x89, 0xc3, 0x83, 0xf2, 0xa2, 0xb5, 0xf6, 0x9a, 0x76, 0x73, 0xf7, + 0x0e, 0xd1, 0xf9, 0x0d, 0xc2, 0x71, 0x19, 0x1e, 0x75, 0x8a, 0x53, 0xdd, 0x4e, 0x11, 0x84, 0x63, + 0xa8, 0x97, 0x15, 0xb6, 0x40, 0xca, 0xa1, 0x86, 0x9b, 0x4f, 0xac, 0x24, 0x57, 0xe7, 0x2e, 0x6f, + 0x6b, 0x23, 0xa8, 0x08, 0x4d, 0x70, 0xbf, 0x41, 0x9a, 0xbb, 0x84, 0xd5, 0xa8, 0x51, 0xce, 0x4a, + 0x02, 0xa9, 0x1a, 0x35, 0x5c, 0x24, 0xe0, 0xe0, 0x07, 0x0a, 0xc8, 0x36, 0xc2, 0x30, 0x37, 0x9f, + 0x14, 0xf8, 0xb5, 0x51, 0xe3, 0x97, 0xff, 0x22, 0xc1, 0xb3, 0x91, 0x41, 0x17, 0xc5, 0xb0, 0xd5, + 0x1f, 0x15, 0xb0, 0x18, 0x95, 0x7d, 0xcb, 0x74, 0x39, 0xbc, 0x3d, 0x20, 0xbd, 0x76, 0x3a, 0xe9, + 0xbd, 0xd5, 0x42, 0xf8, 0x45, 0x09, 0x3d, 0x1b, 0x8c, 0x44, 0x64, 0x6f, 0x83, 0xb4, 0xc9, 0x49, + 0x33, 0xd0, 0xfd, 0xd5, 0x91, 0xec, 0x3b, 0xba, 0x87, 0x72, 0x4e, 0xa2, 0xa7, 0x2b, 0x1e, 0x0e, + 0xf2, 0xe1, 0xd4, 0x6f, 0xd2, 0x60, 0x29, 0x1a, 0x56, 0xc3, 0x5c, 0xdf, 0x9b, 0x40, 0x99, 0x3d, + 0x50, 0x40, 0x06, 0x1b, 0x06, 0x31, 0x6a, 0x63, 0x2e, 0xb6, 0x25, 0x49, 0x23, 0xb3, 0x1e, 0xa0, + 0xa1, 0x10, 0xd8, 0x2b, 0xbb, 0x39, 0x46, 0x9a, 0xb4, 0x2d, 0x89, 0x24, 0xc7, 0x47, 0x64, 0x59, + 0x12, 0x99, 0x43, 0x21, 0x1e, 0x8a, 0x82, 0xc3, 0x4f, 0x15, 0xb0, 0x24, 0xa8, 0x45, 0x4b, 0x33, + 0x9f, 0x1a, 0xd3, 0x45, 0xf8, 0x9b, 0xe4, 0xb3, 0xb4, 0xde, 0x0f, 0x89, 0x06, 0x59, 0xc0, 0xcf, + 0x15, 0xb0, 0x2c, 0xb9, 0xc6, 0xd8, 0xa5, 0xc7, 0xc4, 0xee, 0xef, 0x92, 0xdd, 0x32, 0x1a, 0x04, + 0x45, 0x27, 0x31, 0x51, 0x7f, 0x4b, 0x80, 0xf9, 0x75, 0xc7, 0xb1, 0x4c, 0x62, 0xec, 0xd0, 0xe7, + 0x6e, 0x39, 0x39, 0xb7, 0xfc, 0x45, 0x01, 0x30, 0x2e, 0xfc, 0x04, 0xfc, 0xf2, 0x20, 0xee, 0x97, + 0xa3, 0x51, 0x3e, 0xbe, 0x8b, 0x21, 0x8e, 0xf9, 0x6d, 0x1a, 0x2c, 0xc7, 0x03, 0x9f, 0x7b, 0xe6, + 0x73, 0xcf, 0xfc, 0x73, 0x7a, 0xe6, 0x17, 0x0a, 0x98, 0xdd, 0xb4, 0x0d, 0x87, 0x9a, 0x36, 0x87, + 0xff, 0x04, 0x09, 0xd3, 0x11, 0xa5, 0x9b, 0x2d, 0x2f, 0x77, 0x3b, 0xc5, 0x44, 0xa5, 0x76, 0xdc, + 0x29, 0x66, 0x2a, 0x35, 0xd9, 0x1f, 0xa0, 0x84, 0xe9, 0x40, 0x17, 0xa4, 0x1d, 0xca, 0x78, 0x50, + 0x7e, 0xd5, 0x91, 0x6c, 0xa2, 0x8a, 0x9b, 0xde, 0x71, 0x32, 0x1e, 0x5e, 0x39, 0xef, 0xc9, 0x45, + 0x3e, 0x96, 0x6a, 0x81, 0xb3, 0x9b, 0x07, 0x9c, 0x30, 0x1b, 0x5b, 0x9b, 0x36, 0x37, 0xf9, 0x21, + 0x22, 0x75, 0xc2, 0x88, 0xad, 0x13, 0xb8, 0x02, 0x52, 0x36, 0x6e, 0x12, 0x41, 0x3b, 0x13, 0x7a, + 0xa5, 0x97, 0x11, 0x89, 0x19, 0x58, 0x02, 0x19, 0xef, 0xa7, 0xeb, 0x60, 0x9d, 0xe4, 0x13, 0x22, + 0xac, 0x57, 0xdf, 0xd5, 0x60, 0x02, 0x85, 0x31, 0xea, 0x27, 0x49, 0x30, 0x17, 0x51, 0x09, 0x5a, + 0x20, 0xe9, 0x50, 0x43, 0xde, 0xe9, 0xd1, 0x34, 0x66, 0x35, 0x6a, 0xf4, 0xb6, 0x50, 0x9e, 0xe9, + 0x76, 0x8a, 0x49, 0x6f, 0xc4, 0x83, 0x81, 0x0f, 0x15, 0x30, 0x4f, 0x62, 0x9b, 0x15, 0xa4, 0xe7, + 0x2e, 0xdf, 0x1e, 0x09, 0xf2, 0x10, 0x1d, 0xcb, 0xb0, 0xdb, 0x29, 0xce, 0xf7, 0x4d, 0xf6, 0xf1, + 0x80, 0xf7, 0x41, 0x86, 0xc8, 0x62, 0x09, 0x6e, 0xfd, 0x8d, 0xd1, 0x90, 0x92, 0x59, 0xc3, 0x83, + 0x09, 0x46, 0x5c, 0x14, 0x42, 0xaa, 0x0f, 0x13, 0x60, 0x3e, 0x6e, 0x10, 0x13, 0x3e, 0x1b, 0xff, + 0x86, 0x24, 0x4e, 0x79, 0x43, 0x92, 0x13, 0xbc, 0x21, 0x3f, 0x2b, 0x60, 0xa6, 0x52, 0x2b, 0x5b, + 0x54, 0xdf, 0x87, 0x16, 0x48, 0xe9, 0xa6, 0xc1, 0xa4, 0x28, 0xaf, 0x8c, 0x04, 0xbf, 0x52, 0xab, + 0x12, 0x1e, 0x5e, 0xaf, 0x6b, 0x95, 0x0d, 0x84, 0x04, 0x0a, 0x64, 0x60, 0x9a, 0x1c, 0xe8, 0xc4, + 0xe1, 0xd2, 0x11, 0x46, 0x89, 0x37, 0x2f, 0xf1, 0xa6, 0x37, 0x05, 0x02, 0x92, 0x48, 0x6a, 0x1d, + 0xa4, 0x45, 0xc0, 0xe9, 0x2c, 0xeb, 0x2a, 0xc8, 0x3a, 0x8c, 0xd4, 0xcd, 0x83, 0x2d, 0x62, 0x37, + 0xf8, 0x9e, 0x38, 0xbf, 0x74, 0xd8, 0xd9, 0xd4, 0x22, 0x73, 0x28, 0x16, 0xa9, 0xbe, 0xaf, 0x80, + 0x4c, 0x4f, 0x79, 0xcf, 0x6a, 0x3c, 0xb1, 0x05, 0x5c, 0x3a, 0xda, 0x96, 0x31, 0x8e, 0xc4, 0x4c, + 0xcf, 0x8c, 0x12, 0x43, 0xcd, 0xe8, 0x2a, 0x98, 0x15, 0x6f, 0xf6, 0x3a, 0xb5, 0xf2, 0x49, 0x11, + 0x75, 0x3e, 0x68, 0x72, 0x6a, 0x72, 0xfc, 0x38, 0xf2, 0x3b, 0xea, 0x45, 0xab, 0x0f, 0x53, 0x20, + 0x57, 0x25, 0xfc, 0x2e, 0x65, 0xfb, 0x35, 0x6a, 0x99, 0xfa, 0xe1, 0x04, 0x1a, 0x8e, 0x77, 0x40, + 0x9a, 0xb5, 0x2c, 0x12, 0x98, 0xfd, 0x6b, 0xa3, 0x29, 0xe5, 0xe8, 0x26, 0x50, 0xcb, 0x22, 0x61, + 0x49, 0x7b, 0x4f, 0x2e, 0xf2, 0x31, 0xe1, 0x4b, 0x60, 0x01, 0xc7, 0xda, 0x2c, 0xff, 0x46, 0x65, + 0xc4, 0x41, 0x2f, 0xc4, 0x3b, 0x30, 0x17, 0xf5, 0xc7, 0xc2, 0x55, 0x4f, 0x69, 0x93, 0x32, 0xcf, + 0x40, 0x53, 0x2b, 0xca, 0xaa, 0x52, 0xce, 0xfa, 0x2a, 0xfb, 0x63, 0xa8, 0x37, 0x0b, 0xaf, 0x80, + 0x2c, 0x37, 0x09, 0x0b, 0x66, 0xf2, 0x69, 0x71, 0xbe, 0x8b, 0x5e, 0x6d, 0xec, 0x44, 0xc6, 0x51, + 0x2c, 0x0a, 0xbe, 0xa7, 0x80, 0x8c, 0x4b, 0x5b, 0x4c, 0x27, 0x88, 0xd4, 0xf3, 0xd3, 0x42, 0xff, + 0x37, 0xc7, 0x20, 0x50, 0xcf, 0x8a, 0x72, 0x9e, 0x2f, 0x6e, 0x07, 0x88, 0x28, 0x04, 0x57, 0x7f, + 0x52, 0xc0, 0x52, 0x6c, 0xd1, 0x04, 0xfa, 0xef, 0xbb, 0xf1, 0xfe, 0x1b, 0x8d, 0x7e, 0xe7, 0x43, + 0xda, 0xef, 0xa3, 0xfe, 0xcd, 0xd6, 0x08, 0x61, 0xf0, 0xff, 0x20, 0x87, 0x23, 0x5f, 0x31, 0xdc, + 0xbc, 0x22, 0x4a, 0x65, 0xa9, 0xdb, 0x29, 0xe6, 0xa2, 0x9f, 0x37, 0x5c, 0x14, 0x8f, 0x83, 0xf7, + 0xc0, 0xac, 0xe9, 0x08, 0xdf, 0x0c, 0xb6, 0xb2, 0x35, 0x22, 0x03, 0x13, 0x49, 0x43, 0x0d, 0xe5, + 0x80, 0x8b, 0x7a, 0x78, 0xea, 0x0f, 0x0a, 0xf8, 0xeb, 0xc9, 0x87, 0x0d, 0xff, 0x0b, 0x52, 0xfc, + 0xd0, 0x09, 0xda, 0x9a, 0x0b, 0x81, 0x93, 0xec, 0x1c, 0x3a, 0xe4, 0xb8, 0x53, 0x8c, 0x0b, 0xe0, + 0x0d, 0x22, 0x11, 0xfe, 0x87, 0x7b, 0x9d, 0x9e, 0x63, 0x25, 0x87, 0x3a, 0x56, 0x19, 0x24, 0x5b, + 0xa6, 0x21, 0xae, 0x50, 0xa6, 0x7c, 0x49, 0x06, 0x24, 0x6f, 0x55, 0x36, 0x8e, 0x3b, 0xc5, 0x0b, + 0xc3, 0xbe, 0x69, 0x7a, 0x64, 0x5c, 0xed, 0x56, 0x65, 0x03, 0x79, 0x8b, 0xd5, 0x8f, 0xd3, 0x7d, + 0x67, 0xe6, 0x5d, 0x74, 0xf8, 0x22, 0xc8, 0x18, 0x26, 0x23, 0x3a, 0x37, 0xa9, 0x2d, 0x37, 0x5a, + 0x08, 0xc8, 0x6e, 0x04, 0x13, 0xc7, 0xd1, 0x07, 0x14, 0x2e, 0x80, 0x07, 0x20, 0x55, 0x67, 0xb4, + 0x29, 0x9b, 0xa3, 0x31, 0x58, 0x93, 0x57, 0x57, 0xa1, 0x22, 0xd7, 0x19, 0x6d, 0x22, 0x81, 0x08, + 0x19, 0x48, 0x70, 0x2a, 0x14, 0x1b, 0x1f, 0x2e, 0x90, 0xb8, 0x89, 0x1d, 0x8a, 0x12, 0x9c, 0x7a, + 0x65, 0xea, 0x12, 0xd6, 0x36, 0x75, 0x12, 0xbc, 0xdc, 0x8c, 0xa6, 0x4c, 0xb7, 0xfd, 0xa4, 0x61, + 0x99, 0xca, 0x01, 0x17, 0xf5, 0xf0, 0xe0, 0xbf, 0x23, 0x4e, 0x2a, 0xbd, 0x31, 0xfc, 0x9b, 0x35, + 0xe0, 0xa6, 0x77, 0xc0, 0x34, 0xf6, 0x8f, 0x74, 0x5a, 0x1c, 0x29, 0xf2, 0xfe, 0x7e, 0xaf, 0x07, + 0x67, 0xb9, 0x71, 0xea, 0x8f, 0xfd, 0x44, 0x6f, 0x79, 0xf9, 0x7a, 0xdf, 0xfb, 0x35, 0xaf, 0x66, + 0xfc, 0x3c, 0x48, 0x22, 0xc0, 0x17, 0x40, 0x8e, 0xd8, 0x78, 0xd7, 0x22, 0x5b, 0xb4, 0xd1, 0x30, + 0xed, 0x46, 0x7e, 0x66, 0x45, 0x59, 0x9d, 0x2d, 0x9f, 0x91, 0xf4, 0x72, 0x9b, 0xd1, 0x49, 0x14, + 0x8f, 0x55, 0xbf, 0x4a, 0x00, 0x18, 0x13, 0x7e, 0x9b, 0x63, 0xee, 0x7a, 0xfd, 0x77, 0xce, 0x8e, + 0x0e, 0x4b, 0xf3, 0x1c, 0xab, 0xb7, 0xf7, 0x18, 0xc7, 0xe7, 0xe3, 0x44, 0xe0, 0x7d, 0x90, 0xe5, + 0x0c, 0xd7, 0xeb, 0xa6, 0x2e, 0xa8, 0xca, 0xd2, 0xdf, 0x38, 0x35, 0x31, 0xf1, 0x0f, 0x14, 0xad, + 0x27, 0xe8, 0x4e, 0x24, 0x57, 0xd8, 0x0e, 0x45, 0x47, 0x51, 0x0c, 0x4f, 0x7d, 0x90, 0x06, 0x8b, + 0x55, 0x6a, 0x10, 0xf1, 0xb4, 0xdd, 0x6a, 0x36, 0x31, 0x9b, 0x44, 0x17, 0xf2, 0x99, 0x02, 0x16, + 0xa2, 0x42, 0x98, 0xbd, 0x86, 0xe4, 0xf5, 0xd1, 0x9f, 0x89, 0xaf, 0xc6, 0x59, 0x49, 0x68, 0xa1, + 0x1a, 0xc7, 0x45, 0xfd, 0x44, 0xe0, 0xd7, 0x0a, 0x38, 0xef, 0x83, 0x5d, 0xb3, 0x5a, 0x2e, 0x27, + 0xac, 0x6f, 0x85, 0x7c, 0x0b, 0x18, 0x1b, 0xd3, 0x7f, 0x49, 0xa6, 0xe7, 0xd7, 0x9f, 0x42, 0x02, + 0x3d, 0x95, 0x22, 0xfc, 0x52, 0x01, 0x67, 0xfc, 0x80, 0x7e, 0xf2, 0xa9, 0xf1, 0x92, 0xff, 0x87, + 0x24, 0x7f, 0x66, 0xfd, 0x24, 0x74, 0x74, 0x32, 0x29, 0x15, 0x83, 0x6c, 0xf4, 0x1d, 0x6d, 0x1c, + 0x9f, 0x00, 0x3e, 0x54, 0xc0, 0x8c, 0x74, 0x42, 0x78, 0x25, 0xd2, 0xb2, 0xfb, 0x10, 0xf9, 0x67, + 0xb7, 0xeb, 0xb0, 0x2a, 0x5f, 0x16, 0x12, 0xcf, 0xb8, 0x12, 0x2d, 0x6e, 0x5a, 0x9a, 0xff, 0xdf, + 0x3f, 0xad, 0x62, 0xf3, 0x9b, 0x6c, 0x9b, 0x33, 0xd3, 0x6e, 0x94, 0x67, 0xe3, 0xaf, 0x16, 0xe5, + 0x8b, 0x47, 0x4f, 0x0a, 0x53, 0x8f, 0x9e, 0x14, 0xa6, 0x1e, 0x3f, 0x29, 0x4c, 0xbd, 0xdb, 0x2d, + 0x28, 0x47, 0xdd, 0x82, 0xf2, 0xa8, 0x5b, 0x50, 0x1e, 0x77, 0x0b, 0xca, 0x77, 0xdd, 0x82, 0xf2, + 0xd1, 0xf7, 0x85, 0xa9, 0x37, 0x66, 0xa4, 0xd8, 0xbf, 0x07, 0x00, 0x00, 0xff, 0xff, 0x25, 0x4e, + 0x0a, 0x02, 0x1e, 0x1e, 0x00, 0x00, } func (m *AddressGroup) Marshal() (dAtA []byte, err error) { diff --git a/pkg/apis/controlplane/v1beta1/generated.proto b/pkg/apis/legacy/controlplane/v1beta1/generated.proto similarity index 98% rename from pkg/apis/controlplane/v1beta1/generated.proto rename to pkg/apis/legacy/controlplane/v1beta1/generated.proto index 93871f599cb..9cf4459b1dc 100644 --- a/pkg/apis/controlplane/v1beta1/generated.proto +++ b/pkg/apis/legacy/controlplane/v1beta1/generated.proto @@ -1,4 +1,4 @@ -// Copyright 2020 Antrea Authors +// Copyright 2021 Antrea Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ syntax = 'proto2'; -package github.com.vmware_tanzu.antrea.pkg.apis.controlplane.v1beta1; +package github.com.vmware_tanzu.antrea.pkg.apis.legacy.controlplane.v1beta1; import "github.com/vmware-tanzu/antrea/pkg/apis/stats/v1alpha1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; diff --git a/pkg/apis/controlplane/v1beta1/helper.go b/pkg/apis/legacy/controlplane/v1beta1/helper.go similarity index 100% rename from pkg/apis/controlplane/v1beta1/helper.go rename to pkg/apis/legacy/controlplane/v1beta1/helper.go diff --git a/pkg/apis/legacy/controlplane/v1beta1/register.go b/pkg/apis/legacy/controlplane/v1beta1/register.go index 8d660ce7925..ba58759c73f 100644 --- a/pkg/apis/legacy/controlplane/v1beta1/register.go +++ b/pkg/apis/legacy/controlplane/v1beta1/register.go @@ -18,8 +18,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1" ) // GroupName is the group name used in this package. @@ -44,15 +42,15 @@ var ( // Adds the list of known types to the given scheme. func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &v1beta1.AppliedToGroup{}, - &v1beta1.AppliedToGroupPatch{}, - &v1beta1.AppliedToGroupList{}, - &v1beta1.AddressGroup{}, - &v1beta1.AddressGroupPatch{}, - &v1beta1.AddressGroupList{}, - &v1beta1.NetworkPolicy{}, - &v1beta1.NetworkPolicyList{}, - &v1beta1.NodeStatsSummary{}, + &AppliedToGroup{}, + &AppliedToGroupPatch{}, + &AppliedToGroupList{}, + &AddressGroup{}, + &AddressGroupPatch{}, + &AddressGroupList{}, + &NetworkPolicy{}, + &NetworkPolicyList{}, + &NodeStatsSummary{}, ) metav1.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/pkg/apis/controlplane/v1beta1/sets.go b/pkg/apis/legacy/controlplane/v1beta1/sets.go similarity index 100% rename from pkg/apis/controlplane/v1beta1/sets.go rename to pkg/apis/legacy/controlplane/v1beta1/sets.go diff --git a/pkg/apis/controlplane/v1beta1/types.go b/pkg/apis/legacy/controlplane/v1beta1/types.go similarity index 100% rename from pkg/apis/controlplane/v1beta1/types.go rename to pkg/apis/legacy/controlplane/v1beta1/types.go diff --git a/pkg/apis/controlplane/v1beta1/zz_generated.conversion.go b/pkg/apis/legacy/controlplane/v1beta1/zz_generated.conversion.go similarity index 99% rename from pkg/apis/controlplane/v1beta1/zz_generated.conversion.go rename to pkg/apis/legacy/controlplane/v1beta1/zz_generated.conversion.go index 7814430a334..3512e453659 100644 --- a/pkg/apis/controlplane/v1beta1/zz_generated.conversion.go +++ b/pkg/apis/legacy/controlplane/v1beta1/zz_generated.conversion.go @@ -1,6 +1,6 @@ // +build !ignore_autogenerated -// Copyright 2020 Antrea Authors +// Copyright 2021 Antrea Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/apis/controlplane/v1beta1/zz_generated.deepcopy.go b/pkg/apis/legacy/controlplane/v1beta1/zz_generated.deepcopy.go similarity index 99% rename from pkg/apis/controlplane/v1beta1/zz_generated.deepcopy.go rename to pkg/apis/legacy/controlplane/v1beta1/zz_generated.deepcopy.go index d32c9c968d2..a9c6524d084 100644 --- a/pkg/apis/controlplane/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/legacy/controlplane/v1beta1/zz_generated.deepcopy.go @@ -1,6 +1,6 @@ // +build !ignore_autogenerated -// Copyright 2020 Antrea Authors +// Copyright 2021 Antrea Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/apis/legacy/networking/v1beta1/register.go b/pkg/apis/legacy/networking/v1beta1/register.go index e722a7f6364..3c5da828be0 100644 --- a/pkg/apis/legacy/networking/v1beta1/register.go +++ b/pkg/apis/legacy/networking/v1beta1/register.go @@ -19,7 +19,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1" + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1" ) // GroupName is the group name used in this package. diff --git a/pkg/apis/legacy/stats/v1alpha1/register.go b/pkg/apis/legacy/stats/v1alpha1/register.go index b0d2f43b8e3..fedcb452e4c 100644 --- a/pkg/apis/legacy/stats/v1alpha1/register.go +++ b/pkg/apis/legacy/stats/v1alpha1/register.go @@ -35,8 +35,7 @@ func Resource(resource string) schema.GroupResource { var ( // SchemeBuilder points to a list of functions added to Scheme. - SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) - localSchemeBuilder = &SchemeBuilder + SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) // AddToScheme applies all the stored functions to the scheme. AddToScheme = SchemeBuilder.AddToScheme ) diff --git a/pkg/apis/networking/doc.go b/pkg/apis/networking/doc.go deleted file mode 100644 index ffe6ca8a6fb..00000000000 --- a/pkg/apis/networking/doc.go +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2020 Antrea Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Package networking contains the latest (or "internal") version of the Antrea -// NetworkPolicy API messages. This is the API messages as represented in memory. -// The contract presented to clients is located in the versioned packages, -// which are sub-directories. The first one is "v1beta1". -// It's superseded by package controlplane in v0.9.3, and planned for removal in v0.12. -package networking diff --git a/pkg/apis/networking/install/install.go b/pkg/apis/networking/install/install.go deleted file mode 100644 index a28aff0b8f4..00000000000 --- a/pkg/apis/networking/install/install.go +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2020 Antrea Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package install - -import ( - "k8s.io/apimachinery/pkg/runtime" - utilruntime "k8s.io/apimachinery/pkg/util/runtime" - - "github.com/vmware-tanzu/antrea/pkg/apis/networking" - "github.com/vmware-tanzu/antrea/pkg/apis/networking/v1beta1" -) - -// Install registers the API group and adds types to a scheme -func Install(scheme *runtime.Scheme) { - utilruntime.Must(networking.AddToScheme(scheme)) - utilruntime.Must(v1beta1.AddToScheme(scheme)) - utilruntime.Must(scheme.SetVersionPriority(v1beta1.SchemeGroupVersion)) -} diff --git a/pkg/apis/networking/register.go b/pkg/apis/networking/register.go deleted file mode 100644 index b16a548d7de..00000000000 --- a/pkg/apis/networking/register.go +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright 2020 Antrea Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package networking - -import ( - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" - - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane" -) - -// GroupName is the group name used in this package. -const GroupName = "networking.antrea.io" - -// SchemeGroupVersion is group version used to register these objects. -var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal} - -// Kind takes an unqualified kind and returns a Group qualified GroupKind. -func Kind(kind string) schema.GroupKind { - return SchemeGroupVersion.WithKind(kind).GroupKind() -} - -// Resource takes an unqualified resource and returns a Group qualified GroupResource. -func Resource(resource string) schema.GroupResource { - return SchemeGroupVersion.WithResource(resource).GroupResource() -} - -var ( - // SchemeBuilder points to a list of functions added to Scheme. - SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) - // AddToScheme applies all the stored functions to the scheme. - AddToScheme = SchemeBuilder.AddToScheme -) - -// Adds the list of known types to the given scheme. -func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(SchemeGroupVersion, - &controlplane.AppliedToGroup{}, - &controlplane.AppliedToGroupPatch{}, - &controlplane.AppliedToGroupList{}, - &controlplane.AddressGroup{}, - &controlplane.AddressGroupPatch{}, - &controlplane.AddressGroupList{}, - &controlplane.NetworkPolicy{}, - &controlplane.NetworkPolicyList{}, - ) - return nil -} diff --git a/pkg/apis/networking/v1beta1/conversion.go b/pkg/apis/networking/v1beta1/conversion.go deleted file mode 100644 index 254871b613c..00000000000 --- a/pkg/apis/networking/v1beta1/conversion.go +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright 2020 Antrea Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package v1beta1 - -import ( - "fmt" - - "k8s.io/apimachinery/pkg/runtime" -) - -func init() { - localSchemeBuilder.Register(addConversionFuncs) -} - -// addConversionFuncs adds non-generated conversion functions to the given scheme. -func addConversionFuncs(scheme *runtime.Scheme) error { - for _, kind := range []string{"AppliedToGroup", "AddressGroup", "NetworkPolicy"} { - err := scheme.AddFieldLabelConversionFunc(SchemeGroupVersion.WithKind(kind), - func(label, value string) (string, string, error) { - switch label { - // Antrea Agents select resources by nodeName. - case "metadata.name", "nodeName": - return label, value, nil - default: - return "", "", fmt.Errorf("field label not supported: %s", label) - } - }, - ) - if err != nil { - return err - } - } - return nil -} diff --git a/pkg/apis/networking/v1beta1/doc.go b/pkg/apis/networking/v1beta1/doc.go deleted file mode 100644 index 4ffc6d287e0..00000000000 --- a/pkg/apis/networking/v1beta1/doc.go +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2020 Antrea Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Package v1beta1 is the v1beta1 version of the Antrea NetworkPolicy API messages. -package v1beta1 diff --git a/pkg/apis/networking/v1beta1/register.go b/pkg/apis/networking/v1beta1/register.go deleted file mode 100644 index e96ed853086..00000000000 --- a/pkg/apis/networking/v1beta1/register.go +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright 2020 Antrea Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package v1beta1 - -import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" - - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1" -) - -// GroupName is the group name used in this package. -const GroupName = "networking.antrea.io" - -// SchemeGroupVersion is group version used to register these objects. -var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"} - -// Resource takes an unqualified resource and returns a Group qualified GroupResource. -func Resource(resource string) schema.GroupResource { - return SchemeGroupVersion.WithResource(resource).GroupResource() -} - -var ( - SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) - localSchemeBuilder = &SchemeBuilder - AddToScheme = localSchemeBuilder.AddToScheme -) - -// Adds the list of known types to the given scheme. -func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(SchemeGroupVersion, - &v1beta1.AppliedToGroup{}, - &v1beta1.AppliedToGroupPatch{}, - &v1beta1.AppliedToGroupList{}, - &v1beta1.AddressGroup{}, - &v1beta1.AddressGroupPatch{}, - &v1beta1.AddressGroupList{}, - &v1beta1.NetworkPolicy{}, - &v1beta1.NetworkPolicyList{}, - ) - - metav1.AddToGroupVersion(scheme, SchemeGroupVersion) - return nil -} diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index 7789e92be34..0c8a7c63842 100644 --- a/pkg/apiserver/apiserver.go +++ b/pkg/apiserver/apiserver.go @@ -30,8 +30,6 @@ import ( "github.com/vmware-tanzu/antrea/pkg/apis/controlplane" cpinstall "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/install" - "github.com/vmware-tanzu/antrea/pkg/apis/networking" - networkinginstall "github.com/vmware-tanzu/antrea/pkg/apis/networking/install" apistats "github.com/vmware-tanzu/antrea/pkg/apis/stats" statsinstall "github.com/vmware-tanzu/antrea/pkg/apis/stats/install" systeminstall "github.com/vmware-tanzu/antrea/pkg/apis/system/install" @@ -80,7 +78,6 @@ var ( func init() { cpinstall.Install(Scheme) systeminstall.Install(Scheme) - networkinginstall.Install(Scheme) statsinstall.Install(Scheme) legacycpinstall.Install(Scheme) @@ -164,19 +161,13 @@ func (c *Config) Complete(informers informers.SharedInformerFactory) completedCo } func installAPIGroup(s *APIServer, c completedConfig) error { + cpGroup := genericapiserver.NewDefaultAPIGroupInfo(controlplane.GroupName, Scheme, metav1.ParameterCodec, Codecs) addressGroupStorage := addressgroup.NewREST(c.extraConfig.addressGroupStore) appliedToGroupStorage := appliedtogroup.NewREST(c.extraConfig.appliedToGroupStore) networkPolicyStorage := networkpolicy.NewREST(c.extraConfig.networkPolicyStore) groupStorage := group.NewREST(c.extraConfig.groupStore) networkPolicyStatusStorage := networkpolicy.NewStatusREST(c.extraConfig.networkPolicyStatusController) nodeStatsSummaryStorage := nodestatssummary.NewREST(c.extraConfig.statsAggregator) - cpGroup := genericapiserver.NewDefaultAPIGroupInfo(controlplane.GroupName, Scheme, metav1.ParameterCodec, Codecs) - cpv1beta1Storage := map[string]rest.Storage{} - cpv1beta1Storage["addressgroups"] = addressGroupStorage - cpv1beta1Storage["appliedtogroups"] = appliedToGroupStorage - cpv1beta1Storage["networkpolicies"] = networkPolicyStorage - cpv1beta1Storage["nodestatssummaries"] = nodeStatsSummaryStorage - cpGroup.VersionedResourcesStorageMap["v1beta1"] = cpv1beta1Storage cpv1beta2Storage := map[string]rest.Storage{} cpv1beta2Storage["addressgroups"] = addressGroupStorage cpv1beta2Storage["appliedtogroups"] = appliedToGroupStorage @@ -186,15 +177,6 @@ func installAPIGroup(s *APIServer, c completedConfig) error { cpv1beta2Storage["groups"] = groupStorage cpGroup.VersionedResourcesStorageMap["v1beta2"] = cpv1beta2Storage - // TODO: networkingGroup is the legacy group of controlplane NetworkPolicy APIs. To allow live upgrades from up to - // two minor versions, the APIs must be kept for two minor releases before it can be deleted. - networkingGroup := genericapiserver.NewDefaultAPIGroupInfo(networking.GroupName, Scheme, metav1.ParameterCodec, Codecs) - networkingStorage := map[string]rest.Storage{} - networkingStorage["addressgroups"] = addressGroupStorage - networkingStorage["appliedtogroups"] = appliedToGroupStorage - networkingStorage["networkpolicies"] = networkPolicyStorage - networkingGroup.VersionedResourcesStorageMap["v1beta1"] = networkingStorage - systemGroup := genericapiserver.NewDefaultAPIGroupInfo(system.GroupName, Scheme, metav1.ParameterCodec, Codecs) systemStorage := map[string]rest.Storage{} systemStorage["controllerinfos"] = controllerinfo.NewREST(c.extraConfig.controllerQuerier) @@ -211,11 +193,22 @@ func installAPIGroup(s *APIServer, c completedConfig) error { statsGroup.VersionedResourcesStorageMap["v1alpha1"] = statsStorage legacyCpGroup := genericapiserver.NewDefaultAPIGroupInfo(legacycontrolplane.GroupName, Scheme, metav1.ParameterCodec, Codecs) - legacyCpGroup.VersionedResourcesStorageMap["v1beta1"] = cpv1beta1Storage + legacyCpv1beta1Storage := map[string]rest.Storage{} + legacyCpv1beta1Storage["addressgroups"] = addressGroupStorage + legacyCpv1beta1Storage["appliedtogroups"] = appliedToGroupStorage + legacyCpv1beta1Storage["networkpolicies"] = networkPolicyStorage + legacyCpv1beta1Storage["nodestatssummaries"] = nodeStatsSummaryStorage + legacyCpGroup.VersionedResourcesStorageMap["v1beta1"] = legacyCpv1beta1Storage legacyCpGroup.VersionedResourcesStorageMap["v1beta2"] = cpv1beta2Storage legacyNetworkingGroup := genericapiserver.NewDefaultAPIGroupInfo(legacynetworking.GroupName, Scheme, metav1.ParameterCodec, Codecs) - legacyNetworkingGroup.VersionedResourcesStorageMap["v1beta1"] = networkingStorage + // TODO: networkingGroup is the legacy group of controlplane NetworkPolicy APIs. To allow live upgrades from up to + // two minor versions, the APIs must be kept for two minor releases before it can be deleted. + legacyNetworkingStorage := map[string]rest.Storage{} + legacyNetworkingStorage["addressgroups"] = addressGroupStorage + legacyNetworkingStorage["appliedtogroups"] = appliedToGroupStorage + legacyNetworkingStorage["networkpolicies"] = networkPolicyStorage + legacyNetworkingGroup.VersionedResourcesStorageMap["v1beta1"] = legacyNetworkingStorage legacySystemGroup := genericapiserver.NewDefaultAPIGroupInfo(legacysystem.GroupName, Scheme, metav1.ParameterCodec, Codecs) legacySystemGroup.VersionedResourcesStorageMap["v1beta1"] = systemStorage @@ -223,7 +216,8 @@ func installAPIGroup(s *APIServer, c completedConfig) error { legacyStatsGroup := genericapiserver.NewDefaultAPIGroupInfo(legacyapistats.GroupName, Scheme, metav1.ParameterCodec, Codecs) legacyStatsGroup.VersionedResourcesStorageMap["v1alpha1"] = statsStorage - groups := []*genericapiserver.APIGroupInfo{&cpGroup, &networkingGroup, &systemGroup, &statsGroup} + groups := []*genericapiserver.APIGroupInfo{&cpGroup, &systemGroup, &statsGroup} + // legacy API groups groups = append(groups, &legacyCpGroup, &legacyNetworkingGroup, &legacySystemGroup, &legacyStatsGroup) for _, apiGroupInfo := range groups { if err := s.GenericAPIServer.InstallAPIGroup(apiGroupInfo); err != nil { diff --git a/pkg/apiserver/certificate/cacert_controller.go b/pkg/apiserver/certificate/cacert_controller.go index ef0a827b14e..37dec633553 100644 --- a/pkg/apiserver/certificate/cacert_controller.go +++ b/pkg/apiserver/certificate/cacert_controller.go @@ -49,10 +49,8 @@ var ( "v1beta1.networking.antrea.tanzu.vmware.com", "v1beta1.system.antrea.tanzu.vmware.com", "v1alpha1.stats.antrea.io", - "v1beta1.controlplane.antrea.io", - "v1beta2.controlplane.antrea.io", - "v1beta1.networking.antrea.io", "v1beta1.system.antrea.io", + "v1beta2.controlplane.antrea.io", } // validatingWebhooks contains all the ValidatingWebhookConfigurations backed by antrea-controller. validatingWebhooks = []string{ diff --git a/pkg/apiserver/openapi/zz_generated.openapi.go b/pkg/apiserver/openapi/zz_generated.openapi.go index 2e4de6bb02f..1602414890d 100644 --- a/pkg/apiserver/openapi/zz_generated.openapi.go +++ b/pkg/apiserver/openapi/zz_generated.openapi.go @@ -37,28 +37,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/vmware-tanzu/antrea/pkg/apis/clusterinformation/v1beta1.ControllerCondition": schema_pkg_apis_clusterinformation_v1beta1_ControllerCondition(ref), "github.com/vmware-tanzu/antrea/pkg/apis/clusterinformation/v1beta1.NetworkPolicyControllerInfo": schema_pkg_apis_clusterinformation_v1beta1_NetworkPolicyControllerInfo(ref), "github.com/vmware-tanzu/antrea/pkg/apis/clusterinformation/v1beta1.OVSInfo": schema_pkg_apis_clusterinformation_v1beta1_OVSInfo(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.AddressGroup": schema_pkg_apis_controlplane_v1beta1_AddressGroup(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.AddressGroupList": schema_pkg_apis_controlplane_v1beta1_AddressGroupList(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.AddressGroupPatch": schema_pkg_apis_controlplane_v1beta1_AddressGroupPatch(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.AppliedToGroup": schema_pkg_apis_controlplane_v1beta1_AppliedToGroup(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.AppliedToGroupList": schema_pkg_apis_controlplane_v1beta1_AppliedToGroupList(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.AppliedToGroupPatch": schema_pkg_apis_controlplane_v1beta1_AppliedToGroupPatch(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.Endpoint": schema_pkg_apis_controlplane_v1beta1_Endpoint(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.ExternalEntityReference": schema_pkg_apis_controlplane_v1beta1_ExternalEntityReference(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMember": schema_pkg_apis_controlplane_v1beta1_GroupMember(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMemberPod": schema_pkg_apis_controlplane_v1beta1_GroupMemberPod(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.IPBlock": schema_pkg_apis_controlplane_v1beta1_IPBlock(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.IPNet": schema_pkg_apis_controlplane_v1beta1_IPNet(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NamedPort": schema_pkg_apis_controlplane_v1beta1_NamedPort(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicy": schema_pkg_apis_controlplane_v1beta1_NetworkPolicy(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicyList": schema_pkg_apis_controlplane_v1beta1_NetworkPolicyList(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicyPeer": schema_pkg_apis_controlplane_v1beta1_NetworkPolicyPeer(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicyReference": schema_pkg_apis_controlplane_v1beta1_NetworkPolicyReference(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicyRule": schema_pkg_apis_controlplane_v1beta1_NetworkPolicyRule(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicyStats": schema_pkg_apis_controlplane_v1beta1_NetworkPolicyStats(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NodeStatsSummary": schema_pkg_apis_controlplane_v1beta1_NodeStatsSummary(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.PodReference": schema_pkg_apis_controlplane_v1beta1_PodReference(ref), - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.Service": schema_pkg_apis_controlplane_v1beta1_Service(ref), "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.AddressGroup": schema_pkg_apis_controlplane_v1beta2_AddressGroup(ref), "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.AddressGroupList": schema_pkg_apis_controlplane_v1beta2_AddressGroupList(ref), "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.AddressGroupPatch": schema_pkg_apis_controlplane_v1beta2_AddressGroupPatch(ref), @@ -83,6 +61,28 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NodeStatsSummary": schema_pkg_apis_controlplane_v1beta2_NodeStatsSummary(ref), "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.PodReference": schema_pkg_apis_controlplane_v1beta2_PodReference(ref), "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.Service": schema_pkg_apis_controlplane_v1beta2_Service(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.AddressGroup": schema_apis_legacy_controlplane_v1beta1_AddressGroup(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.AddressGroupList": schema_apis_legacy_controlplane_v1beta1_AddressGroupList(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.AddressGroupPatch": schema_apis_legacy_controlplane_v1beta1_AddressGroupPatch(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.AppliedToGroup": schema_apis_legacy_controlplane_v1beta1_AppliedToGroup(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.AppliedToGroupList": schema_apis_legacy_controlplane_v1beta1_AppliedToGroupList(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.AppliedToGroupPatch": schema_apis_legacy_controlplane_v1beta1_AppliedToGroupPatch(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.Endpoint": schema_apis_legacy_controlplane_v1beta1_Endpoint(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.ExternalEntityReference": schema_apis_legacy_controlplane_v1beta1_ExternalEntityReference(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMember": schema_apis_legacy_controlplane_v1beta1_GroupMember(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMemberPod": schema_apis_legacy_controlplane_v1beta1_GroupMemberPod(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.IPBlock": schema_apis_legacy_controlplane_v1beta1_IPBlock(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.IPNet": schema_apis_legacy_controlplane_v1beta1_IPNet(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NamedPort": schema_apis_legacy_controlplane_v1beta1_NamedPort(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicy": schema_apis_legacy_controlplane_v1beta1_NetworkPolicy(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicyList": schema_apis_legacy_controlplane_v1beta1_NetworkPolicyList(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicyPeer": schema_apis_legacy_controlplane_v1beta1_NetworkPolicyPeer(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicyReference": schema_apis_legacy_controlplane_v1beta1_NetworkPolicyReference(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicyRule": schema_apis_legacy_controlplane_v1beta1_NetworkPolicyRule(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicyStats": schema_apis_legacy_controlplane_v1beta1_NetworkPolicyStats(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NodeStatsSummary": schema_apis_legacy_controlplane_v1beta1_NodeStatsSummary(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.PodReference": schema_apis_legacy_controlplane_v1beta1_PodReference(ref), + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.Service": schema_apis_legacy_controlplane_v1beta1_Service(ref), "github.com/vmware-tanzu/antrea/pkg/apis/stats/v1alpha1.AntreaClusterNetworkPolicyStats": schema_pkg_apis_stats_v1alpha1_AntreaClusterNetworkPolicyStats(ref), "github.com/vmware-tanzu/antrea/pkg/apis/stats/v1alpha1.AntreaClusterNetworkPolicyStatsList": schema_pkg_apis_stats_v1alpha1_AntreaClusterNetworkPolicyStatsList(ref), "github.com/vmware-tanzu/antrea/pkg/apis/stats/v1alpha1.AntreaNetworkPolicyStats": schema_pkg_apis_stats_v1alpha1_AntreaNetworkPolicyStats(ref), @@ -798,7 +798,7 @@ func schema_pkg_apis_clusterinformation_v1beta1_OVSInfo(ref common.ReferenceCall } } -func schema_pkg_apis_controlplane_v1beta1_AddressGroup(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_AddressGroup(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -824,25 +824,13 @@ func schema_pkg_apis_controlplane_v1beta1_AddressGroup(ref common.ReferenceCallb Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), }, }, - "pods": { - SchemaProps: spec.SchemaProps{ - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMemberPod"), - }, - }, - }, - }, - }, "groupMembers": { SchemaProps: spec.SchemaProps{ Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMember"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember"), }, }, }, @@ -852,11 +840,11 @@ func schema_pkg_apis_controlplane_v1beta1_AddressGroup(ref common.ReferenceCallb }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMember", "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMemberPod", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_controlplane_v1beta1_AddressGroupList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_AddressGroupList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -888,7 +876,7 @@ func schema_pkg_apis_controlplane_v1beta1_AddressGroupList(ref common.ReferenceC Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.AddressGroup"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.AddressGroup"), }, }, }, @@ -899,11 +887,11 @@ func schema_pkg_apis_controlplane_v1beta1_AddressGroupList(ref common.ReferenceC }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.AddressGroup", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.AddressGroup", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_controlplane_v1beta1_AddressGroupPatch(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_AddressGroupPatch(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -929,37 +917,13 @@ func schema_pkg_apis_controlplane_v1beta1_AddressGroupPatch(ref common.Reference Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), }, }, - "addedPods": { - SchemaProps: spec.SchemaProps{ - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMemberPod"), - }, - }, - }, - }, - }, - "removedPods": { - SchemaProps: spec.SchemaProps{ - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMemberPod"), - }, - }, - }, - }, - }, "addedGroupMembers": { SchemaProps: spec.SchemaProps{ Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMember"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember"), }, }, }, @@ -971,7 +935,7 @@ func schema_pkg_apis_controlplane_v1beta1_AddressGroupPatch(ref common.Reference Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMember"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember"), }, }, }, @@ -981,11 +945,11 @@ func schema_pkg_apis_controlplane_v1beta1_AddressGroupPatch(ref common.Reference }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMember", "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMemberPod", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_controlplane_v1beta1_AppliedToGroup(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_AppliedToGroup(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1011,27 +975,14 @@ func schema_pkg_apis_controlplane_v1beta1_AppliedToGroup(ref common.ReferenceCal Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), }, }, - "pods": { - SchemaProps: spec.SchemaProps{ - Description: "Pods is a list of Pods selected by this group.", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMemberPod"), - }, - }, - }, - }, - }, "groupMembers": { SchemaProps: spec.SchemaProps{ - Description: "GroupMembers is list of resources selected by this group. This eventually will replace Pods", + Description: "GroupMembers is list of resources selected by this group.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMember"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember"), }, }, }, @@ -1041,11 +992,11 @@ func schema_pkg_apis_controlplane_v1beta1_AppliedToGroup(ref common.ReferenceCal }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMember", "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMemberPod", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_controlplane_v1beta1_AppliedToGroupList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_AppliedToGroupList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1077,7 +1028,7 @@ func schema_pkg_apis_controlplane_v1beta1_AppliedToGroupList(ref common.Referenc Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.AppliedToGroup"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.AppliedToGroup"), }, }, }, @@ -1088,11 +1039,11 @@ func schema_pkg_apis_controlplane_v1beta1_AppliedToGroupList(ref common.Referenc }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.AppliedToGroup", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.AppliedToGroup", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_controlplane_v1beta1_AppliedToGroupPatch(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_AppliedToGroupPatch(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1118,37 +1069,13 @@ func schema_pkg_apis_controlplane_v1beta1_AppliedToGroupPatch(ref common.Referen Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), }, }, - "addedPods": { - SchemaProps: spec.SchemaProps{ - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMemberPod"), - }, - }, - }, - }, - }, - "removedPods": { - SchemaProps: spec.SchemaProps{ - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMemberPod"), - }, - }, - }, - }, - }, "addedGroupMembers": { SchemaProps: spec.SchemaProps{ Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMember"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember"), }, }, }, @@ -1160,7 +1087,7 @@ func schema_pkg_apis_controlplane_v1beta1_AppliedToGroupPatch(ref common.Referen Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMember"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember"), }, }, }, @@ -1170,140 +1097,172 @@ func schema_pkg_apis_controlplane_v1beta1_AppliedToGroupPatch(ref common.Referen }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMember", "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.GroupMemberPod", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_controlplane_v1beta1_Endpoint(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_ExternalEntityReference(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "Endpoint represents an external endpoint.", + Description: "ExternalEntityReference represents a ExternalEntity Reference.", Type: []string{"object"}, Properties: map[string]spec.Schema{ - "ip": { + "name": { SchemaProps: spec.SchemaProps{ - Description: "IP is the IP address of the Endpoint.", + Description: "The name of this ExternalEntity.", Type: []string{"string"}, - Format: "byte", + Format: "", }, }, - "ports": { + "namespace": { SchemaProps: spec.SchemaProps{ - Description: "Ports is the list NamedPort of the Endpoint.", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NamedPort"), - }, - }, - }, + Description: "The namespace of this ExternalEntity.", + Type: []string{"string"}, + Format: "", }, }, }, }, }, - Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NamedPort"}, } } -func schema_pkg_apis_controlplane_v1beta1_ExternalEntityReference(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_Group(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "ExternalEntityReference represents a ExternalEntity Reference.", + Description: "Group is the message format of antrea/pkg/controller/types.Group in an API response. An internal Group is created corresponding to a ClusterGroup resource, i.e. it is a 1:1 mapping. The UID of this Group is the same as that of it's corresponding ClusterGroup.", Type: []string{"object"}, Properties: map[string]spec.Schema{ - "name": { + "kind": { SchemaProps: spec.SchemaProps{ - Description: "The name of this ExternalEntity.", + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", Type: []string{"string"}, Format: "", }, }, - "namespace": { + "apiVersion": { SchemaProps: spec.SchemaProps{ - Description: "The namespace of this ExternalEntity.", + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", Type: []string{"string"}, Format: "", }, }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), + }, + }, + "groupMembers": { + SchemaProps: spec.SchemaProps{ + Description: "\n GroupMembers is a list of resources selected by this Group based on the selectors\n\tpresent in the corresponding ClusterGroup.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember"), + }, + }, + }, + }, + }, }, }, }, + Dependencies: []string{ + "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_controlplane_v1beta1_GroupMember(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_GroupList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "GroupMember represents resource member to be populated in Groups. This supersedes GroupMemberPod, and will eventually replace it.", + Description: "GroupList is a list of Group objects.", Type: []string{"object"}, Properties: map[string]spec.Schema{ - "pod": { + "kind": { SchemaProps: spec.SchemaProps{ - Description: "Pod maintains the reference to the Pod.", - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.PodReference"), + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", }, }, - "externalEntity": { + "apiVersion": { SchemaProps: spec.SchemaProps{ - Description: "ExternalEntity maintains the reference to the ExternalEntity.", - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.ExternalEntityReference"), + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", }, }, - "endpoints": { + "metadata": { SchemaProps: spec.SchemaProps{ - Description: "Endpoints maintains a list of EndPoints associated with this groupMember.", - Type: []string{"array"}, + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"), + }, + }, + "items": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.Endpoint"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.Group"), }, }, }, }, }, }, + Required: []string{"items"}, }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.Endpoint", "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.ExternalEntityReference", "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.PodReference"}, + "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.Group", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_controlplane_v1beta1_GroupMemberPod(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_GroupMember(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "GroupMemberPod represents a GroupMember related to Pods.", + Description: "GroupMember represents resource member to be populated in Groups. This supersedes GroupMemberPod, and will eventually replace it.", Type: []string{"object"}, Properties: map[string]spec.Schema{ "pod": { SchemaProps: spec.SchemaProps{ Description: "Pod maintains the reference to the Pod.", - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.PodReference"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.PodReference"), }, }, - "ip": { + "externalEntity": { SchemaProps: spec.SchemaProps{ - Description: "IP maintains the IPAddress associated with the Pod.", - Type: []string{"string"}, - Format: "byte", + Description: "ExternalEntity maintains the reference to the ExternalEntity.", + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.ExternalEntityReference"), + }, + }, + "ips": { + SchemaProps: spec.SchemaProps{ + Description: "IP is the IP address of the Endpoints associated with the GroupMember.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "byte", + }, + }, + }, }, }, "ports": { SchemaProps: spec.SchemaProps{ - Description: "Ports maintain the named port mapping of this Pod.", + Description: "Ports is the list NamedPort of the GroupMember.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NamedPort"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NamedPort"), }, }, }, @@ -1313,11 +1272,11 @@ func schema_pkg_apis_controlplane_v1beta1_GroupMemberPod(ref common.ReferenceCal }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NamedPort", "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.PodReference"}, + "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.ExternalEntityReference", "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NamedPort", "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.PodReference"}, } } -func schema_pkg_apis_controlplane_v1beta1_IPBlock(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_IPBlock(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1327,7 +1286,7 @@ func schema_pkg_apis_controlplane_v1beta1_IPBlock(ref common.ReferenceCallback) "cidr": { SchemaProps: spec.SchemaProps{ Description: "CIDR is an IPNet represents the IP Block.", - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.IPNet"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.IPNet"), }, }, "except": { @@ -1337,7 +1296,7 @@ func schema_pkg_apis_controlplane_v1beta1_IPBlock(ref common.ReferenceCallback) Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.IPNet"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.IPNet"), }, }, }, @@ -1348,11 +1307,11 @@ func schema_pkg_apis_controlplane_v1beta1_IPBlock(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.IPNet"}, + "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.IPNet"}, } } -func schema_pkg_apis_controlplane_v1beta1_IPNet(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_IPNet(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1377,7 +1336,7 @@ func schema_pkg_apis_controlplane_v1beta1_IPNet(ref common.ReferenceCallback) co } } -func schema_pkg_apis_controlplane_v1beta1_NamedPort(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_NamedPort(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1411,7 +1370,7 @@ func schema_pkg_apis_controlplane_v1beta1_NamedPort(ref common.ReferenceCallback } } -func schema_pkg_apis_controlplane_v1beta1_NetworkPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_NetworkPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1439,12 +1398,12 @@ func schema_pkg_apis_controlplane_v1beta1_NetworkPolicy(ref common.ReferenceCall }, "rules": { SchemaProps: spec.SchemaProps{ - Description: "Rules is a list of rules to be applied to the selected Pods.", + Description: "Rules is a list of rules to be applied to the selected GroupMembers.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicyRule"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyRule"), }, }, }, @@ -1452,7 +1411,7 @@ func schema_pkg_apis_controlplane_v1beta1_NetworkPolicy(ref common.ReferenceCall }, "appliedToGroups": { SchemaProps: spec.SchemaProps{ - Description: "AppliedToGroups is a list of names of AppliedToGroups to which this policy applies.", + Description: "AppliedToGroups is a list of names of AppliedToGroups to which this policy applies. Cannot be set in conjunction with any NetworkPolicyRule.AppliedToGroups in Rules.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ @@ -1481,18 +1440,18 @@ func schema_pkg_apis_controlplane_v1beta1_NetworkPolicy(ref common.ReferenceCall "sourceRef": { SchemaProps: spec.SchemaProps{ Description: "Reference to the original NetworkPolicy that the internal NetworkPolicy is created for.", - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicyReference"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyReference"), }, }, }, }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicyReference", "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicyRule", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyReference", "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyRule", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_controlplane_v1beta1_NetworkPolicyList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1524,7 +1483,7 @@ func schema_pkg_apis_controlplane_v1beta1_NetworkPolicyList(ref common.Reference Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicy"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicy"), }, }, }, @@ -1535,11 +1494,38 @@ func schema_pkg_apis_controlplane_v1beta1_NetworkPolicyList(ref common.Reference }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicy", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicy", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + } +} + +func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyNodeStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "NetworkPolicyNodeStatus is the status of a NetworkPolicy on a Node.", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "nodeName": { + SchemaProps: spec.SchemaProps{ + Description: "The name of the Node that produces the status.", + Type: []string{"string"}, + Format: "", + }, + }, + "generation": { + SchemaProps: spec.SchemaProps{ + Description: "The generation realized by the Node.", + Type: []string{"integer"}, + Format: "int64", + }, + }, + }, + }, + }, } } -func schema_pkg_apis_controlplane_v1beta1_NetworkPolicyPeer(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyPeer(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1567,7 +1553,7 @@ func schema_pkg_apis_controlplane_v1beta1_NetworkPolicyPeer(ref common.Reference Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.IPBlock"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.IPBlock"), }, }, }, @@ -1577,11 +1563,11 @@ func schema_pkg_apis_controlplane_v1beta1_NetworkPolicyPeer(ref common.Reference }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.IPBlock"}, + "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.IPBlock"}, } } -func schema_pkg_apis_controlplane_v1beta1_NetworkPolicyReference(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyReference(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1621,7 +1607,7 @@ func schema_pkg_apis_controlplane_v1beta1_NetworkPolicyReference(ref common.Refe } } -func schema_pkg_apis_controlplane_v1beta1_NetworkPolicyRule(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyRule(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1637,14 +1623,14 @@ func schema_pkg_apis_controlplane_v1beta1_NetworkPolicyRule(ref common.Reference }, "from": { SchemaProps: spec.SchemaProps{ - Description: "From represents sources which should be able to access the pods selected by the policy.", - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicyPeer"), + Description: "From represents sources which should be able to access the GroupMembers selected by the policy.", + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyPeer"), }, }, "to": { SchemaProps: spec.SchemaProps{ - Description: "To represents destinations which should be able to be accessed by the pods selected by the policy.", - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicyPeer"), + Description: "To represents destinations which should be able to be accessed by the GroupMembers selected by the policy.", + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyPeer"), }, }, "services": { @@ -1654,7 +1640,7 @@ func schema_pkg_apis_controlplane_v1beta1_NetworkPolicyRule(ref common.Reference Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.Service"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.Service"), }, }, }, @@ -1681,16 +1667,30 @@ func schema_pkg_apis_controlplane_v1beta1_NetworkPolicyRule(ref common.Reference Format: "", }, }, + "appliedToGroups": { + SchemaProps: spec.SchemaProps{ + Description: "AppliedToGroups is a list of names of AppliedToGroups to which this rule applies. Cannot be set in conjunction with NetworkPolicy.AppliedToGroups of the NetworkPolicy that this Rule is referred to.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, }, Required: []string{"enableLogging"}, }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicyPeer", "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.Service"}, + "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyPeer", "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.Service"}, } } -func schema_pkg_apis_controlplane_v1beta1_NetworkPolicyStats(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyStats(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1700,7 +1700,7 @@ func schema_pkg_apis_controlplane_v1beta1_NetworkPolicyStats(ref common.Referenc "networkPolicy": { SchemaProps: spec.SchemaProps{ Description: "The reference of the NetworkPolicy.", - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicyReference"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyReference"), }, }, "trafficStats": { @@ -1713,11 +1713,58 @@ func schema_pkg_apis_controlplane_v1beta1_NetworkPolicyStats(ref common.Referenc }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicyReference", "github.com/vmware-tanzu/antrea/pkg/apis/stats/v1alpha1.TrafficStats"}, + "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyReference", "github.com/vmware-tanzu/antrea/pkg/apis/stats/v1alpha1.TrafficStats"}, + } +} + +func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "NetworkPolicyStatus is the status of a NetworkPolicy.", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), + }, + }, + "nodes": { + SchemaProps: spec.SchemaProps{ + Description: "Nodes contains statuses produced on a list of Nodes.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyNodeStatus"), + }, + }, + }, + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyNodeStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_controlplane_v1beta1_NodeStatsSummary(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_NodeStatsSummary(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1750,7 +1797,7 @@ func schema_pkg_apis_controlplane_v1beta1_NodeStatsSummary(ref common.ReferenceC Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicyStats"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyStats"), }, }, }, @@ -1763,7 +1810,7 @@ func schema_pkg_apis_controlplane_v1beta1_NodeStatsSummary(ref common.ReferenceC Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicyStats"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyStats"), }, }, }, @@ -1776,7 +1823,7 @@ func schema_pkg_apis_controlplane_v1beta1_NodeStatsSummary(ref common.ReferenceC Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicyStats"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyStats"), }, }, }, @@ -1786,11 +1833,11 @@ func schema_pkg_apis_controlplane_v1beta1_NodeStatsSummary(ref common.ReferenceC }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1.NetworkPolicyStats", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyStats", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_controlplane_v1beta1_PodReference(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_PodReference(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1817,7 +1864,7 @@ func schema_pkg_apis_controlplane_v1beta1_PodReference(ref common.ReferenceCallb } } -func schema_pkg_apis_controlplane_v1beta1_Service(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_controlplane_v1beta2_Service(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1837,6 +1884,13 @@ func schema_pkg_apis_controlplane_v1beta1_Service(ref common.ReferenceCallback) Ref: ref("k8s.io/apimachinery/pkg/util/intstr.IntOrString"), }, }, + "endPort": { + SchemaProps: spec.SchemaProps{ + Description: "EndPort defines the end of the port range, being the end included within the range. It can only be specified when a numerical `port` is specified.", + Type: []string{"integer"}, + Format: "int32", + }, + }, }, }, }, @@ -1845,7 +1899,7 @@ func schema_pkg_apis_controlplane_v1beta1_Service(ref common.ReferenceCallback) } } -func schema_pkg_apis_controlplane_v1beta2_AddressGroup(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_AddressGroup(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1871,13 +1925,25 @@ func schema_pkg_apis_controlplane_v1beta2_AddressGroup(ref common.ReferenceCallb Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), }, }, + "pods": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMemberPod"), + }, + }, + }, + }, + }, "groupMembers": { SchemaProps: spec.SchemaProps{ Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMember"), }, }, }, @@ -1887,11 +1953,11 @@ func schema_pkg_apis_controlplane_v1beta2_AddressGroup(ref common.ReferenceCallb }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMember", "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMemberPod", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_controlplane_v1beta2_AddressGroupList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_AddressGroupList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1923,7 +1989,7 @@ func schema_pkg_apis_controlplane_v1beta2_AddressGroupList(ref common.ReferenceC Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.AddressGroup"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.AddressGroup"), }, }, }, @@ -1934,11 +2000,11 @@ func schema_pkg_apis_controlplane_v1beta2_AddressGroupList(ref common.ReferenceC }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.AddressGroup", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.AddressGroup", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_controlplane_v1beta2_AddressGroupPatch(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_AddressGroupPatch(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1964,13 +2030,37 @@ func schema_pkg_apis_controlplane_v1beta2_AddressGroupPatch(ref common.Reference Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), }, }, + "addedPods": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMemberPod"), + }, + }, + }, + }, + }, + "removedPods": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMemberPod"), + }, + }, + }, + }, + }, "addedGroupMembers": { SchemaProps: spec.SchemaProps{ Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMember"), }, }, }, @@ -1982,7 +2072,7 @@ func schema_pkg_apis_controlplane_v1beta2_AddressGroupPatch(ref common.Reference Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMember"), }, }, }, @@ -1992,11 +2082,11 @@ func schema_pkg_apis_controlplane_v1beta2_AddressGroupPatch(ref common.Reference }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMember", "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMemberPod", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_controlplane_v1beta2_AppliedToGroup(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_AppliedToGroup(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2022,14 +2112,27 @@ func schema_pkg_apis_controlplane_v1beta2_AppliedToGroup(ref common.ReferenceCal Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), }, }, + "pods": { + SchemaProps: spec.SchemaProps{ + Description: "Pods is a list of Pods selected by this group.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMemberPod"), + }, + }, + }, + }, + }, "groupMembers": { SchemaProps: spec.SchemaProps{ - Description: "GroupMembers is list of resources selected by this group.", + Description: "GroupMembers is list of resources selected by this group. This eventually will replace Pods", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMember"), }, }, }, @@ -2039,11 +2142,11 @@ func schema_pkg_apis_controlplane_v1beta2_AppliedToGroup(ref common.ReferenceCal }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMember", "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMemberPod", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_controlplane_v1beta2_AppliedToGroupList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_AppliedToGroupList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2075,7 +2178,7 @@ func schema_pkg_apis_controlplane_v1beta2_AppliedToGroupList(ref common.Referenc Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.AppliedToGroup"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.AppliedToGroup"), }, }, }, @@ -2086,11 +2189,11 @@ func schema_pkg_apis_controlplane_v1beta2_AppliedToGroupList(ref common.Referenc }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.AppliedToGroup", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.AppliedToGroup", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_controlplane_v1beta2_AppliedToGroupPatch(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_AppliedToGroupPatch(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2116,13 +2219,37 @@ func schema_pkg_apis_controlplane_v1beta2_AppliedToGroupPatch(ref common.Referen Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), }, }, + "addedPods": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMemberPod"), + }, + }, + }, + }, + }, + "removedPods": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMemberPod"), + }, + }, + }, + }, + }, "addedGroupMembers": { SchemaProps: spec.SchemaProps{ Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMember"), }, }, }, @@ -2134,7 +2261,7 @@ func schema_pkg_apis_controlplane_v1beta2_AppliedToGroupPatch(ref common.Referen Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMember"), }, }, }, @@ -2144,172 +2271,140 @@ func schema_pkg_apis_controlplane_v1beta2_AppliedToGroupPatch(ref common.Referen }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMember", "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.GroupMemberPod", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_controlplane_v1beta2_ExternalEntityReference(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_Endpoint(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "ExternalEntityReference represents a ExternalEntity Reference.", + Description: "Endpoint represents an external endpoint.", Type: []string{"object"}, Properties: map[string]spec.Schema{ - "name": { + "ip": { SchemaProps: spec.SchemaProps{ - Description: "The name of this ExternalEntity.", + Description: "IP is the IP address of the Endpoint.", Type: []string{"string"}, - Format: "", + Format: "byte", }, }, - "namespace": { + "ports": { SchemaProps: spec.SchemaProps{ - Description: "The namespace of this ExternalEntity.", - Type: []string{"string"}, - Format: "", + Description: "Ports is the list NamedPort of the Endpoint.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NamedPort"), + }, + }, + }, }, }, }, }, }, + Dependencies: []string{ + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NamedPort"}, } } -func schema_pkg_apis_controlplane_v1beta2_Group(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_ExternalEntityReference(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "Group is the message format of antrea/pkg/controller/types.Group in an API response. An internal Group is created corresponding to a ClusterGroup resource, i.e. it is a 1:1 mapping. The UID of this Group is the same as that of it's corresponding ClusterGroup.", + Description: "ExternalEntityReference represents a ExternalEntity Reference.", Type: []string{"object"}, Properties: map[string]spec.Schema{ - "kind": { + "name": { SchemaProps: spec.SchemaProps{ - Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + Description: "The name of this ExternalEntity.", Type: []string{"string"}, Format: "", }, }, - "apiVersion": { + "namespace": { SchemaProps: spec.SchemaProps{ - Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + Description: "The namespace of this ExternalEntity.", Type: []string{"string"}, Format: "", }, }, - "metadata": { - SchemaProps: spec.SchemaProps{ - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), - }, - }, - "groupMembers": { - SchemaProps: spec.SchemaProps{ - Description: "\n GroupMembers is a list of resources selected by this Group based on the selectors\n\tpresent in the corresponding ClusterGroup.", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember"), - }, - }, - }, - }, - }, }, }, }, - Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.GroupMember", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_controlplane_v1beta2_GroupList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_GroupMember(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "GroupList is a list of Group objects.", + Description: "GroupMember represents resource member to be populated in Groups. This supersedes GroupMemberPod, and will eventually replace it.", Type: []string{"object"}, Properties: map[string]spec.Schema{ - "kind": { - SchemaProps: spec.SchemaProps{ - Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - Type: []string{"string"}, - Format: "", - }, - }, - "apiVersion": { + "pod": { SchemaProps: spec.SchemaProps{ - Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - Type: []string{"string"}, - Format: "", + Description: "Pod maintains the reference to the Pod.", + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.PodReference"), }, }, - "metadata": { + "externalEntity": { SchemaProps: spec.SchemaProps{ - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"), + Description: "ExternalEntity maintains the reference to the ExternalEntity.", + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.ExternalEntityReference"), }, }, - "items": { + "endpoints": { SchemaProps: spec.SchemaProps{ - Type: []string{"array"}, + Description: "Endpoints maintains a list of EndPoints associated with this groupMember.", + Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.Group"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.Endpoint"), }, }, }, }, }, }, - Required: []string{"items"}, }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.Group", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.Endpoint", "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.ExternalEntityReference", "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.PodReference"}, } } -func schema_pkg_apis_controlplane_v1beta2_GroupMember(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_GroupMemberPod(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "GroupMember represents resource member to be populated in Groups. This supersedes GroupMemberPod, and will eventually replace it.", + Description: "GroupMemberPod represents a GroupMember related to Pods.", Type: []string{"object"}, Properties: map[string]spec.Schema{ "pod": { SchemaProps: spec.SchemaProps{ Description: "Pod maintains the reference to the Pod.", - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.PodReference"), - }, - }, - "externalEntity": { - SchemaProps: spec.SchemaProps{ - Description: "ExternalEntity maintains the reference to the ExternalEntity.", - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.ExternalEntityReference"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.PodReference"), }, }, - "ips": { + "ip": { SchemaProps: spec.SchemaProps{ - Description: "IP is the IP address of the Endpoints associated with the GroupMember.", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "byte", - }, - }, - }, + Description: "IP maintains the IPAddress associated with the Pod.", + Type: []string{"string"}, + Format: "byte", }, }, "ports": { SchemaProps: spec.SchemaProps{ - Description: "Ports is the list NamedPort of the GroupMember.", + Description: "Ports maintain the named port mapping of this Pod.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NamedPort"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NamedPort"), }, }, }, @@ -2319,11 +2414,11 @@ func schema_pkg_apis_controlplane_v1beta2_GroupMember(ref common.ReferenceCallba }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.ExternalEntityReference", "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NamedPort", "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.PodReference"}, + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NamedPort", "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.PodReference"}, } } -func schema_pkg_apis_controlplane_v1beta2_IPBlock(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_IPBlock(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2333,7 +2428,7 @@ func schema_pkg_apis_controlplane_v1beta2_IPBlock(ref common.ReferenceCallback) "cidr": { SchemaProps: spec.SchemaProps{ Description: "CIDR is an IPNet represents the IP Block.", - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.IPNet"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.IPNet"), }, }, "except": { @@ -2343,7 +2438,7 @@ func schema_pkg_apis_controlplane_v1beta2_IPBlock(ref common.ReferenceCallback) Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.IPNet"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.IPNet"), }, }, }, @@ -2354,11 +2449,11 @@ func schema_pkg_apis_controlplane_v1beta2_IPBlock(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.IPNet"}, + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.IPNet"}, } } -func schema_pkg_apis_controlplane_v1beta2_IPNet(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_IPNet(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2383,7 +2478,7 @@ func schema_pkg_apis_controlplane_v1beta2_IPNet(ref common.ReferenceCallback) co } } -func schema_pkg_apis_controlplane_v1beta2_NamedPort(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_NamedPort(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2417,7 +2512,7 @@ func schema_pkg_apis_controlplane_v1beta2_NamedPort(ref common.ReferenceCallback } } -func schema_pkg_apis_controlplane_v1beta2_NetworkPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_NetworkPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2445,12 +2540,12 @@ func schema_pkg_apis_controlplane_v1beta2_NetworkPolicy(ref common.ReferenceCall }, "rules": { SchemaProps: spec.SchemaProps{ - Description: "Rules is a list of rules to be applied to the selected GroupMembers.", + Description: "Rules is a list of rules to be applied to the selected Pods.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyRule"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicyRule"), }, }, }, @@ -2458,7 +2553,7 @@ func schema_pkg_apis_controlplane_v1beta2_NetworkPolicy(ref common.ReferenceCall }, "appliedToGroups": { SchemaProps: spec.SchemaProps{ - Description: "AppliedToGroups is a list of names of AppliedToGroups to which this policy applies. Cannot be set in conjunction with any NetworkPolicyRule.AppliedToGroups in Rules.", + Description: "AppliedToGroups is a list of names of AppliedToGroups to which this policy applies.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ @@ -2487,18 +2582,18 @@ func schema_pkg_apis_controlplane_v1beta2_NetworkPolicy(ref common.ReferenceCall "sourceRef": { SchemaProps: spec.SchemaProps{ Description: "Reference to the original NetworkPolicy that the internal NetworkPolicy is created for.", - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyReference"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicyReference"), }, }, }, }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyReference", "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyRule", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicyReference", "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicyRule", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_NetworkPolicyList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2530,7 +2625,7 @@ func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyList(ref common.Reference Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicy"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicy"), }, }, }, @@ -2541,38 +2636,11 @@ func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyList(ref common.Reference }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicy", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicy", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyNodeStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "NetworkPolicyNodeStatus is the status of a NetworkPolicy on a Node.", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "nodeName": { - SchemaProps: spec.SchemaProps{ - Description: "The name of the Node that produces the status.", - Type: []string{"string"}, - Format: "", - }, - }, - "generation": { - SchemaProps: spec.SchemaProps{ - Description: "The generation realized by the Node.", - Type: []string{"integer"}, - Format: "int64", - }, - }, - }, - }, - }, - } -} - -func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyPeer(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_NetworkPolicyPeer(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2600,7 +2668,7 @@ func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyPeer(ref common.Reference Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.IPBlock"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.IPBlock"), }, }, }, @@ -2610,11 +2678,11 @@ func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyPeer(ref common.Reference }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.IPBlock"}, + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.IPBlock"}, } } -func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyReference(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_NetworkPolicyReference(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2654,7 +2722,7 @@ func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyReference(ref common.Refe } } -func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyRule(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_NetworkPolicyRule(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2670,14 +2738,14 @@ func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyRule(ref common.Reference }, "from": { SchemaProps: spec.SchemaProps{ - Description: "From represents sources which should be able to access the GroupMembers selected by the policy.", - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyPeer"), + Description: "From represents sources which should be able to access the pods selected by the policy.", + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicyPeer"), }, }, "to": { SchemaProps: spec.SchemaProps{ - Description: "To represents destinations which should be able to be accessed by the GroupMembers selected by the policy.", - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyPeer"), + Description: "To represents destinations which should be able to be accessed by the pods selected by the policy.", + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicyPeer"), }, }, "services": { @@ -2687,7 +2755,7 @@ func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyRule(ref common.Reference Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.Service"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.Service"), }, }, }, @@ -2714,30 +2782,16 @@ func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyRule(ref common.Reference Format: "", }, }, - "appliedToGroups": { - SchemaProps: spec.SchemaProps{ - Description: "AppliedToGroups is a list of names of AppliedToGroups to which this rule applies. Cannot be set in conjunction with NetworkPolicy.AppliedToGroups of the NetworkPolicy that this Rule is referred to.", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - }, - }, - }, }, Required: []string{"enableLogging"}, }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyPeer", "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.Service"}, + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicyPeer", "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.Service"}, } } -func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyStats(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_NetworkPolicyStats(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2747,7 +2801,7 @@ func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyStats(ref common.Referenc "networkPolicy": { SchemaProps: spec.SchemaProps{ Description: "The reference of the NetworkPolicy.", - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyReference"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicyReference"), }, }, "trafficStats": { @@ -2760,58 +2814,11 @@ func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyStats(ref common.Referenc }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyReference", "github.com/vmware-tanzu/antrea/pkg/apis/stats/v1alpha1.TrafficStats"}, + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicyReference", "github.com/vmware-tanzu/antrea/pkg/apis/stats/v1alpha1.TrafficStats"}, } } -func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "NetworkPolicyStatus is the status of a NetworkPolicy.", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "kind": { - SchemaProps: spec.SchemaProps{ - Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - Type: []string{"string"}, - Format: "", - }, - }, - "apiVersion": { - SchemaProps: spec.SchemaProps{ - Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - Type: []string{"string"}, - Format: "", - }, - }, - "metadata": { - SchemaProps: spec.SchemaProps{ - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), - }, - }, - "nodes": { - SchemaProps: spec.SchemaProps{ - Description: "Nodes contains statuses produced on a list of Nodes.", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyNodeStatus"), - }, - }, - }, - }, - }, - }, - }, - }, - Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyNodeStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, - } -} - -func schema_pkg_apis_controlplane_v1beta2_NodeStatsSummary(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_NodeStatsSummary(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2844,7 +2851,7 @@ func schema_pkg_apis_controlplane_v1beta2_NodeStatsSummary(ref common.ReferenceC Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyStats"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicyStats"), }, }, }, @@ -2857,7 +2864,7 @@ func schema_pkg_apis_controlplane_v1beta2_NodeStatsSummary(ref common.ReferenceC Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyStats"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicyStats"), }, }, }, @@ -2870,7 +2877,7 @@ func schema_pkg_apis_controlplane_v1beta2_NodeStatsSummary(ref common.ReferenceC Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyStats"), + Ref: ref("github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicyStats"), }, }, }, @@ -2880,11 +2887,11 @@ func schema_pkg_apis_controlplane_v1beta2_NodeStatsSummary(ref common.ReferenceC }, }, Dependencies: []string{ - "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyStats", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1.NetworkPolicyStats", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_controlplane_v1beta2_PodReference(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_PodReference(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2911,7 +2918,7 @@ func schema_pkg_apis_controlplane_v1beta2_PodReference(ref common.ReferenceCallb } } -func schema_pkg_apis_controlplane_v1beta2_Service(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_apis_legacy_controlplane_v1beta1_Service(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2931,13 +2938,6 @@ func schema_pkg_apis_controlplane_v1beta2_Service(ref common.ReferenceCallback) Ref: ref("k8s.io/apimachinery/pkg/util/intstr.IntOrString"), }, }, - "endPort": { - SchemaProps: spec.SchemaProps{ - Description: "EndPort defines the end of the port range, being the end included within the range. It can only be specified when a numerical `port` is specified.", - Type: []string{"integer"}, - Format: "int32", - }, - }, }, }, }, diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index d209f5a2eb5..6e928eed915 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -1,4 +1,4 @@ -// Copyright 2020 Antrea Authors +// Copyright 2021 Antrea Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,9 +18,9 @@ package fake import ( clusterinformationv1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/clusterinformation/v1beta1" - controlplanev1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1" controlplanev1beta2 "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2" corev1alpha2 "github.com/vmware-tanzu/antrea/pkg/apis/core/v1alpha2" + controlplanev1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1" opsv1alpha1 "github.com/vmware-tanzu/antrea/pkg/apis/ops/v1alpha1" securityv1alpha1 "github.com/vmware-tanzu/antrea/pkg/apis/security/v1alpha1" statsv1alpha1 "github.com/vmware-tanzu/antrea/pkg/apis/stats/v1alpha1" diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index a1c5055a5ed..aa7697eeb8e 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -1,4 +1,4 @@ -// Copyright 2020 Antrea Authors +// Copyright 2021 Antrea Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,9 +18,9 @@ package scheme import ( clusterinformationv1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/clusterinformation/v1beta1" - controlplanev1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1" controlplanev1beta2 "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta2" corev1alpha2 "github.com/vmware-tanzu/antrea/pkg/apis/core/v1alpha2" + controlplanev1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1" opsv1alpha1 "github.com/vmware-tanzu/antrea/pkg/apis/ops/v1alpha1" securityv1alpha1 "github.com/vmware-tanzu/antrea/pkg/apis/security/v1alpha1" statsv1alpha1 "github.com/vmware-tanzu/antrea/pkg/apis/stats/v1alpha1" diff --git a/pkg/client/clientset/versioned/typed/controlplane/v1beta1/addressgroup.go b/pkg/client/clientset/versioned/typed/controlplane/v1beta1/addressgroup.go index 2f385064b2d..cb742cf03e3 100644 --- a/pkg/client/clientset/versioned/typed/controlplane/v1beta1/addressgroup.go +++ b/pkg/client/clientset/versioned/typed/controlplane/v1beta1/addressgroup.go @@ -1,4 +1,4 @@ -// Copyright 2020 Antrea Authors +// Copyright 2021 Antrea Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import ( "context" "time" - v1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1" + v1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1" scheme "github.com/vmware-tanzu/antrea/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/controlplane/v1beta1/appliedtogroup.go b/pkg/client/clientset/versioned/typed/controlplane/v1beta1/appliedtogroup.go index ec313b62a77..42e2a48fa03 100644 --- a/pkg/client/clientset/versioned/typed/controlplane/v1beta1/appliedtogroup.go +++ b/pkg/client/clientset/versioned/typed/controlplane/v1beta1/appliedtogroup.go @@ -1,4 +1,4 @@ -// Copyright 2020 Antrea Authors +// Copyright 2021 Antrea Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import ( "context" "time" - v1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1" + v1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1" scheme "github.com/vmware-tanzu/antrea/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/controlplane/v1beta1/controlplane_client.go b/pkg/client/clientset/versioned/typed/controlplane/v1beta1/controlplane_client.go index 6dea05badc0..e7ff96e2e2e 100644 --- a/pkg/client/clientset/versioned/typed/controlplane/v1beta1/controlplane_client.go +++ b/pkg/client/clientset/versioned/typed/controlplane/v1beta1/controlplane_client.go @@ -1,4 +1,4 @@ -// Copyright 2020 Antrea Authors +// Copyright 2021 Antrea Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package v1beta1 import ( - v1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1" + v1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1" "github.com/vmware-tanzu/antrea/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/clientset/versioned/typed/controlplane/v1beta1/fake/fake_addressgroup.go b/pkg/client/clientset/versioned/typed/controlplane/v1beta1/fake/fake_addressgroup.go index 5f7730749cd..a12b1b0962d 100644 --- a/pkg/client/clientset/versioned/typed/controlplane/v1beta1/fake/fake_addressgroup.go +++ b/pkg/client/clientset/versioned/typed/controlplane/v1beta1/fake/fake_addressgroup.go @@ -1,4 +1,4 @@ -// Copyright 2020 Antrea Authors +// Copyright 2021 Antrea Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ package fake import ( "context" - v1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1" + v1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/controlplane/v1beta1/fake/fake_appliedtogroup.go b/pkg/client/clientset/versioned/typed/controlplane/v1beta1/fake/fake_appliedtogroup.go index 98e431b2eca..50271ded0e1 100644 --- a/pkg/client/clientset/versioned/typed/controlplane/v1beta1/fake/fake_appliedtogroup.go +++ b/pkg/client/clientset/versioned/typed/controlplane/v1beta1/fake/fake_appliedtogroup.go @@ -1,4 +1,4 @@ -// Copyright 2020 Antrea Authors +// Copyright 2021 Antrea Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ package fake import ( "context" - v1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1" + v1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/controlplane/v1beta1/fake/fake_networkpolicy.go b/pkg/client/clientset/versioned/typed/controlplane/v1beta1/fake/fake_networkpolicy.go index 95237367bf0..f3fcab455f0 100644 --- a/pkg/client/clientset/versioned/typed/controlplane/v1beta1/fake/fake_networkpolicy.go +++ b/pkg/client/clientset/versioned/typed/controlplane/v1beta1/fake/fake_networkpolicy.go @@ -1,4 +1,4 @@ -// Copyright 2020 Antrea Authors +// Copyright 2021 Antrea Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ package fake import ( "context" - v1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1" + v1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/controlplane/v1beta1/fake/fake_nodestatssummary.go b/pkg/client/clientset/versioned/typed/controlplane/v1beta1/fake/fake_nodestatssummary.go index 8046fa58181..b1770d94f09 100644 --- a/pkg/client/clientset/versioned/typed/controlplane/v1beta1/fake/fake_nodestatssummary.go +++ b/pkg/client/clientset/versioned/typed/controlplane/v1beta1/fake/fake_nodestatssummary.go @@ -1,4 +1,4 @@ -// Copyright 2020 Antrea Authors +// Copyright 2021 Antrea Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ package fake import ( "context" - v1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1" + v1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" schema "k8s.io/apimachinery/pkg/runtime/schema" testing "k8s.io/client-go/testing" diff --git a/pkg/client/clientset/versioned/typed/controlplane/v1beta1/networkpolicy.go b/pkg/client/clientset/versioned/typed/controlplane/v1beta1/networkpolicy.go index f5a47610117..2d43083c55a 100644 --- a/pkg/client/clientset/versioned/typed/controlplane/v1beta1/networkpolicy.go +++ b/pkg/client/clientset/versioned/typed/controlplane/v1beta1/networkpolicy.go @@ -1,4 +1,4 @@ -// Copyright 2020 Antrea Authors +// Copyright 2021 Antrea Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import ( "context" "time" - v1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1" + v1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1" scheme "github.com/vmware-tanzu/antrea/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/controlplane/v1beta1/nodestatssummary.go b/pkg/client/clientset/versioned/typed/controlplane/v1beta1/nodestatssummary.go index cf4f87874df..2f4a2ee2da5 100644 --- a/pkg/client/clientset/versioned/typed/controlplane/v1beta1/nodestatssummary.go +++ b/pkg/client/clientset/versioned/typed/controlplane/v1beta1/nodestatssummary.go @@ -1,4 +1,4 @@ -// Copyright 2020 Antrea Authors +// Copyright 2021 Antrea Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ package v1beta1 import ( "context" - v1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/controlplane/v1beta1" + v1beta1 "github.com/vmware-tanzu/antrea/pkg/apis/legacy/controlplane/v1beta1" scheme "github.com/vmware-tanzu/antrea/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" rest "k8s.io/client-go/rest"