extend antreaconfig crd

Signed-off-by: Bin Liu <[email protected]>
vmware-tanzu · Nov 2, 2022 · 284c294 · 284c294
1 parent d0c3040
commit 284c294
Show file tree

Hide file tree

Showing 5 changed files with 175 additions and 3 deletions.
diff --git a/addons/controllers/antrea/antreaconfig_util.go b/addons/controllers/antrea/antreaconfig_util.go
@@ -21,14 +21,37 @@ import (
 
 // AntreaConfigSpec defines the desired state of AntreaConfig
 type antreaConfigSpec struct {
-	InfraProvider string `yaml:"infraProvider"`
-	Antrea        antrea `yaml:"antrea,omitempty"`
+	InfraProvider string    `yaml:"infraProvider"`
+	Antrea        antrea    `yaml:"antrea,omitempty"`
+	AntreaNsx     antreaNsx `yaml:"antreaNsx,omitempty"`
 }
 
 type antrea struct {
 	AntreaConfigDataValue antreaConfigDataValue `yaml:"config,omitempty"`
 }
 
+type antreaNsx struct {
+	Enable            bool              `yaml:"enable,omitempty"`
+	BootstrapFrom     string            `yaml:"bootstrapFrom,omitempty"`
+	AntreaNsxProvider antreaNsxProvider `yaml:"provider,omitempty"`
+	AntreaNsxInline   antreaNsxInline   `yaml:"inline,omitempty"`
+	AntreaNsxConfig   antreaNsxConfig   `yaml:"config,omitempty"`
+}
+
+type antreaNsxProvider struct {
+	ApiGroup string `yaml:"apiGroup,omitempty"`
+	kind     string `yaml:"kind,omitempty"`
+}
+
+type antreaNsxInline struct {
+	NsxManagers []string `yaml:"nsxManagers,omitempty"`
+	ClusterName string   `yaml:"ClusterName,omitempty"`
+	NsxCertRef  string   `yaml:"NsxCertRef,omitempty"`
+}
+
+type antreaNsxConfig struct {
+}
+
 type antreaEgress struct {
 	EgressExceptCIDRs []string `yaml:"exceptCIDRs,omitempty"`
 }

diff --git a/apis/addonconfigs/cni/v1alpha1/antreaconfig_types.go b/apis/addonconfigs/cni/v1alpha1/antreaconfig_types.go
@@ -11,7 +11,8 @@ type AntreaProxyNodePortAddress []string
 
 // AntreaConfigSpec defines the desired state of AntreaConfig
 type AntreaConfigSpec struct {
-	Antrea Antrea `json:"antrea,omitempty"`
+	Antrea    Antrea    `json:"antrea,omitempty"`
+	AntreaNsx AntreaNsx `json:"antreaNsx,omitempty"`
 }
 
 type Antrea struct {
@@ -198,6 +199,28 @@ type AntreaConfigStatus struct {
 	SecretRef string `json:"secretRef,omitempty"`
 }
 
+type AntreaNsx struct {
+	Enable            bool              `json:"enable,omitempty"`
+	BootstrapFrom     string            `json:"bootstrapFrom,omitempty"`
+	AntreaNsxProvider AntreaNsxProvider `json:"provider,omitempty"`
+	AntreaNsxInline   AntreaNsxInline   `json:"inline,omitempty"`
+	AntreaNsxConfig   AntreaNsxConfig   `json:"config,omitempty"`
+}
+
+type AntreaNsxProvider struct {
+	ApiGroup string `json:"apiGroup,omitempty"`
+	kind     string `json:"kind,omitempty"`
+}
+
+type AntreaNsxInline struct {
+	NsxManagers []string `json:"nsxManagers,omitempty"`
+	ClusterName string   `json:"ClusterName,omitempty"`
+	NsxCertRef  string   `json:"NsxCertRef,omitempty"`
+}
+
+type AntreaNsxConfig struct {
+}
+
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:path=antreaconfigs,shortName=antreaconf,scope=Namespaced

diff --git a/apis/addonconfigs/cni/v1alpha1/zz_generated.deepcopy.go b/apis/addonconfigs/cni/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/addonconfigs/config/crd/bases/cni.tanzu.vmware.com_antreaconfigs.yaml b/apis/addonconfigs/config/crd/bases/cni.tanzu.vmware.com_antreaconfigs.yaml
@@ -227,6 +227,33 @@ spec:
                         type: object
                     type: object
                 type: object
+              antreaNsx:
+                properties:
+                  bootstrapFrom:
+                    type: string
+                  config:
+                    type: object
+                  enable:
+                    type: boolean
+                  inline:
+                    properties:
+                      ClusterName:
+                        type: string
+                      NsxCertRef:
+                        type: string
+                      nsxManagers:
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                  provider:
+                    properties:
+                      apiGroup:
+                        type: string
+                      kind:
+                        type: string
+                    type: object
+                type: object
             type: object
           status:
             description: AntreaConfigStatus defines the observed state of AntreaConfig

diff --git a/...s-manager/bundle/config/upstream/addonconfigscrds/cni.tanzu.vmware.com_antreaconfigs.yaml b/...s-manager/bundle/config/upstream/addonconfigscrds/cni.tanzu.vmware.com_antreaconfigs.yaml
@@ -227,10 +227,40 @@ spec:
                         type: object
                     type: object
                 type: object
+              antreaNsx:
+                properties:
+                  bootstrapFrom:
+                    type: string
+                  config:
+                    type: object
+                  enable:
+                    type: boolean
+                  inline:
+                    properties:
+                      ClusterName:
+                        type: string
+                      NsxCertRef:
+                        type: string
+                      nsxManagers:
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                  provider:
+                    properties:
+                      apiGroup:
+                        type: string
+                      kind:
+                        type: string
+                    type: object
+                type: object
             type: object
           status:
             description: AntreaConfigStatus defines the observed state of AntreaConfig
             properties:
+              message:
+                description: Message to indicate failure reason
+                type: string
               secretRef:
                 description: Reference to the data value secret created by controller
                 type: string