fix crd

Author: zbb88888

.gitignore

@@ -91,6 +91,7 @@ flycheck_*.el
 *.test
 
 # Output of the go coverage tool, specifically when used with LiteIDE
+cover.out
 *.out
 
 ### Vim ###

README.md

@@ -72,7 +72,16 @@ make bundle-push
 ## 目前不支持直接测试，必须要先把bundle 传到 registry，有issue记录: https://github.com/operator-framework/operator-sdk/issues/6432
 
 
-# 在 k8s 中运行
+```
+
+
+### 3.2 基于 olm 部署
+
+[operator-sdk 二进制安装方式](https://sdk.operatorframework.io/docs/installation/)
+
+```bash
+# 在 k8s集群安装该项目
+operator-sdk olm install
 
 ## ref https://github.com/operator-framework/operator-lifecycle-manager/releases/tag/v0.24.0
 
@@ -104,11 +113,3 @@ operator-sdk cleanup vpn-gw
 
 
 
-### 3.2 基于 olm 部署
-
-[operator-sdk 二进制安装方式](https://sdk.operatorframework.io/docs/installation/)
-
-```bash
-# 在 k8s集群安装该项目
-operator-sdk olm install
-```

api/v1/vpngw_types.go

@@ -29,13 +29,13 @@ type VpnGwSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
+	// vpn gw static ip
+	Ip string `json:"ip"`
 	// pod subnet
 	// the vpn gw server pod running inside in this pod
 	// user can access all pod in this subnet via vpn gw
 	// if use subnet lb vip in this subnet, so no need svc cidr in this case
-	Subnet string `json:"subnet"`
-	// vpn gw static ip
-	Ip       string `json:"ip"`
+	Subnet   string `json:"subnet"`
 	Replicas int32  `json:"replicas"`
 	// vpn gw pod node selector
 	Selector []string `json:"selector"`
@@ -62,16 +62,16 @@ type VpnGwSpec struct {
 	SslVpnImage string `json:"sslVpnImage"`
 
 	// vpn gw enable ipsec vpn
-	EnableIpsecVpn bool `json:"EnableIpsecVpn"`
+	EnableIpsecVpn bool `json:"enableIpsecVpn"`
 	// ipsec use strongswan server
 	// all ipsec vpn spec start with ipsec
 	IpsecVpnImage string `json:"ipsecVpnImage"`
 }
 
 // VpnGwStatus defines the observed state of VpnGw
 type VpnGwStatus struct {
-	Subnet         string              `json:"subnet" patchStrategy:"merge"`
 	Ip             string              `json:"ip" patchStrategy:"merge"`
+	Subnet         string              `json:"subnet" patchStrategy:"merge"`
 	Replicas       int32               `json:"replicas" patchStrategy:"merge"`
 	Selector       []string            `json:"selector" patchStrategy:"merge"`
 	Tolerations    []corev1.Toleration `json:"tolerations" patchStrategy:"merge"`

bundle/manifests/vpn-gw.clusterserviceversion.yaml

@@ -21,7 +21,7 @@ metadata:
         }
       ]
     capabilities: Basic Install
-    createdAt: "2023-06-04T02:01:17Z"
+    createdAt: "2023-06-05T04:21:17Z"
     operators.operatorframework.io/builder: operator-sdk-v1.28.1
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4-alpha
   name: vpn-gw.v0.0.1

bundle/manifests/vpn-gw.kube-ovn-operator.com_vpngws.yaml

@@ -50,9 +50,6 @@ spec:
           spec:
             description: VpnGwSpec defines the desired state of VpnGw
             properties:
-              EnableIpsecVpn:
-                description: vpn gw enable ipsec vpn
-                type: boolean
               affinity:
                 description: vpn gw pod affinity
                 properties:
@@ -881,6 +878,9 @@ spec:
                         type: array
                     type: object
                 type: object
+              enableIpsecVpn:
+                description: vpn gw enable ipsec vpn
+                type: boolean
               enableSslVpn:
                 description: vpn gw enable ssl vpn
                 type: boolean
@@ -963,8 +963,8 @@ spec:
                   type: object
                 type: array
             required:
-            - EnableIpsecVpn
             - affinity
+            - enableIpsecVpn
             - enableSslVpn
             - ip
             - ipsecVpnImage

config/crd/bases/vpn-gw.kube-ovn-operator.com_vpngws.yaml

@@ -51,9 +51,6 @@ spec:
           spec:
             description: VpnGwSpec defines the desired state of VpnGw
             properties:
-              EnableIpsecVpn:
-                description: vpn gw enable ipsec vpn
-                type: boolean
               affinity:
                 description: vpn gw pod affinity
                 properties:
@@ -882,6 +879,9 @@ spec:
                         type: array
                     type: object
                 type: object
+              enableIpsecVpn:
+                description: vpn gw enable ipsec vpn
+                type: boolean
               enableSslVpn:
                 description: vpn gw enable ssl vpn
                 type: boolean
@@ -964,8 +964,8 @@ spec:
                   type: object
                 type: array
             required:
-            - EnableIpsecVpn
             - affinity
+            - enableIpsecVpn
             - enableSslVpn
             - ip
             - ipsecVpnImage