Merge pull request projectcalico#3 from song-jiang/song-api

Added NewXXX functions to each defined v3 resource

Author: song-jiang

go.mod

@@ -17,7 +17,7 @@ require (
 	k8s.io/api v0.21.0-rc.0
 	k8s.io/apimachinery v0.21.0-rc.0
 	k8s.io/client-go v0.21.0-rc.0
-	k8s.io/code-generator v0.0.0-00010101000000-000000000000 // indirect
+	k8s.io/code-generator v0.21.0-rc.0
 	k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
 )
 

pkg/apis/projectcalico/v3/bgpconfig.go

@@ -119,3 +119,14 @@ type PrefixAdvertisement struct {
 	// Where,`aa` is an AS Number, `nn` and `mm` are per-AS identifier.
 	Communities []string `json:"communities,omitempty" validate:"required"`
 }
+
+// New BGPConfiguration creates a new (zeroed) BGPConfiguration struct with the TypeMetadata
+// initialized to the current version.
+func NewBGPConfiguration() *BGPConfiguration {
+	return &BGPConfiguration{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       KindBGPConfiguration,
+			APIVersion: GroupVersionCurrent,
+		},
+	}
+}

pkg/apis/projectcalico/v3/bgppeer.go

@@ -107,3 +107,14 @@ type BGPPassword struct {
 	// Selects a key of a secret in the node pod's namespace.
 	SecretKeyRef *k8sv1.SecretKeySelector `json:"secretKeyRef,omitempty"`
 }
+
+// NewBGPPeer creates a new (zeroed) BGPPeer struct with the TypeMetadata initialised to the current
+// version.
+func NewBGPPeer() *BGPPeer {
+	return &BGPPeer{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       KindBGPPeer,
+			APIVersion: GroupVersionCurrent,
+		},
+	}
+}

pkg/apis/projectcalico/v3/clusterinfo.go

@@ -59,3 +59,14 @@ type ClusterInformationSpec struct {
 	// Variant declares which variant of Calico should be active.
 	Variant string `json:"variant,omitempty"`
 }
+
+// New ClusterInformation creates a new (zeroed) ClusterInformation struct with the TypeMetadata
+// initialized to the current version.
+func NewClusterInformation() *ClusterInformation {
+	return &ClusterInformation{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       KindClusterInformation,
+			APIVersion: GroupVersionCurrent,
+		},
+	}
+}

pkg/apis/projectcalico/v3/felixconfig.go

@@ -396,3 +396,14 @@ type ProtoPort struct {
 	// +optional
 	Net string `json:"net"`
 }
+
+// New FelixConfiguration creates a new (zeroed) FelixConfiguration struct with the TypeMetadata
+// initialized to the current version.
+func NewFelixConfiguration() *FelixConfiguration {
+	return &FelixConfiguration{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       KindFelixConfiguration,
+			APIVersion: GroupVersionCurrent,
+		},
+	}
+}

pkg/apis/projectcalico/v3/globalnetworkpolicy.go

@@ -116,3 +116,14 @@ type GlobalNetworkPolicySpec struct {
 	// NamespaceSelector is an optional field for an expression used to select a pod based on namespaces.
 	NamespaceSelector string `json:"namespaceSelector,omitempty" validate:"selector"`
 }
+
+// NewGlobalNetworkPolicy creates a new (zeroed) GlobalNetworkPolicy struct with the TypeMetadata initialised to the current
+// version.
+func NewGlobalNetworkPolicy() *GlobalNetworkPolicy {
+	return &GlobalNetworkPolicy{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       KindGlobalNetworkPolicy,
+			APIVersion: GroupVersionCurrent,
+		},
+	}
+}

pkg/apis/projectcalico/v3/globalnetworkset.go

@@ -50,3 +50,14 @@ type GlobalNetworkSetSpec struct {
 	// The list of IP networks that belong to this set.
 	Nets []string `json:"nets,omitempty" validate:"omitempty,dive,cidr"`
 }
+
+// NewGlobalNetworkSet creates a new (zeroed) NetworkSet struct with the TypeMetadata initialised to the current
+// version.
+func NewGlobalNetworkSet() *GlobalNetworkSet {
+	return &GlobalNetworkSet{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       KindGlobalNetworkSet,
+			APIVersion: GroupVersionCurrent,
+		},
+	}
+}

pkg/apis/projectcalico/v3/hostendpoint.go

@@ -89,3 +89,14 @@ type EndpointPort struct {
 	Protocol numorstring.Protocol `json:"protocol"`
 	Port     uint16               `json:"port" validate:"gt=0"`
 }
+
+// NewHostEndpoint creates a new (zeroed) HostEndpoint struct with the TypeMetadata initialised to the current
+// version.
+func NewHostEndpoint() *HostEndpoint {
+	return &HostEndpoint{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       KindHostEndpoint,
+			APIVersion: GroupVersionCurrent,
+		},
+	}
+}

pkg/apis/projectcalico/v3/ippool.go

@@ -73,7 +73,7 @@ type IPPoolSpec struct {
 
 	// Deprecated: this field is only used for APIv1 backwards compatibility.
 	// Setting this field is not allowed, this field is for internal use only.
-	IPIP IPIPConfiguration `json:"ipip,omitempty" validate:"omitempty,mustBeNil"`
+	IPIP *IPIPConfiguration `json:"ipip,omitempty" validate:"omitempty,mustBeNil"`
 
 	// Deprecated: this field is only used for APIv1 backwards compatibility.
 	// Setting this field is not allowed, this field is for internal use only.
@@ -120,3 +120,14 @@ type IPIPConfiguration struct {
 	// originating node.  The default value (if not specified) is "always".
 	Mode EncapMode `json:"mode,omitempty" validate:"ipIpMode"`
 }
+
+// NewIPPool creates a new (zeroed) IPPool struct with the TypeMetadata initialised to the current
+// version.
+func NewIPPool() *IPPool {
+	return &IPPool{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       KindIPPool,
+			APIVersion: GroupVersionCurrent,
+		},
+	}
+}

pkg/apis/projectcalico/v3/kubecontrollersconfig.go

@@ -140,3 +140,14 @@ type KubeControllersConfigurationStatus struct {
 	// the RunningConfig.
 	EnvironmentVars map[string]string `json:"environmentVars,omitempty"`
 }
+
+// New KubeControllersConfiguration creates a new (zeroed) KubeControllersConfiguration struct with
+// the TypeMetadata initialized to the current version.
+func NewKubeControllersConfiguration() *KubeControllersConfiguration {
+	return &KubeControllersConfiguration{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       KindKubeControllersConfiguration,
+			APIVersion: GroupVersionCurrent,
+		},
+	}
+}