fix schema

Signed-off-by: Wenqi Qiu <wenqiq@vmware.com>
vmware-tanzu · Dec 8, 2022 · 1f664f6 · 1f664f6
1 parent 8797d71
commit 1f664f6
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 43 deletions.
diff --git a/addons/packages/antrea/1.7.1-p1/bundle/.imgpkg/images.yml b/addons/packages/antrea/1.7.1-p1/bundle/.imgpkg/images.yml
@@ -10,7 +10,7 @@ images:
   image: index.docker.io/antrea/antrea-ubuntu@sha256:90deeed74e5631ce3c514c4bf12e284bd5040dac5480f0eec0436fdbcaabe85d
 - annotations:
   kbld.carvel.dev/id: antreainterworking/interworking-debian:0.7.0
-    kbld.carvel.dev/origins: |
+  kbld.carvel.dev/origins: |
       - resolved:
           tag: 0.7.0
           url: antreainterworking/interworking-debian:0.7.0

diff --git a/addons/packages/antrea/1.7.1-p1/bundle/config/kapp-config.yaml b/addons/packages/antrea/1.7.1-p1/bundle/config/kapp-config.yaml
@@ -8,7 +8,7 @@ rebaseRules:
   - kindNamespaceNameMatcher: {kind: ConfigMap, namespace: kube-system, name: antrea-ca}
   - kindNamespaceNameMatcher: {kind: Secret, namespace: vmware-system-antrea, name: nsx-cert}
   - kindNamespaceNameMatcher: {kind: ConfigMap, namespace: vmware-system-antrea, name: bootstrap-config}
-  - kindNamespaceNameMatcher: {kind: ConfigMap, namespace: vmware-system-antrea, name: nsx-cert}
+  - kindNamespaceNameMatcher: {kind: ConfigMap, namespace: vmware-system-antrea, name: antrea-interworking-config}
 
 - path: [spec, caBundle]
   type: copy

diff --git a/addons/packages/antrea/1.7.1-p1/bundle/config/overlay/interworking-bootstrap-overlay.yaml b/addons/packages/antrea/1.7.1-p1/bundle/config/overlay/interworking-bootstrap-overlay.yaml
@@ -10,8 +10,6 @@ tls.crt: #@ values.antrea_interworking.config.nsxCert
 tls.key: #@ values.antrea_interworking.config.nsxKey
 #@ end
 
-
-
 #! Antrea-interworking-bootstrap-config-secret
 #@overlay/match by=overlay.subset({"kind":"Secret","metadata":{"name": "nsx-cert"}})
 #@ if/end values.antrea_nsx.enable:
@@ -20,12 +18,11 @@ kind: Secret
 data: #@ yaml.encode(antrea_interworking_bootstrap_secret_conf())
 
 #@ def antrea_interworking_bootstrap_conf():
-clusterName: #@ values.antrea_interworking.config.ClusterName
-NSXManagers: #@ [values.antrea_interworking.config.NSXIP1]
-VPCPath: #@ values.antrea_interworking.config.VPCPath
+clusterName: #@ values.antrea_interworking.config.clusterName
+NSXManagers: #@ values.antrea_interworking.config.NSXManagers
+vpcPath: #@ values.antrea_interworking.config.vpcPath
 #@ end
 
-
 #! Antrea-interworking-bootstrap-config
 #@overlay/match by=overlay.subset({"kind":"ConfigMap","metadata":{"name": "bootstrap-config"}})
 #@ if/end values.antrea_nsx.enable:

diff --git a/addons/packages/antrea/1.7.1-p1/bundle/config/schema.yaml b/addons/packages/antrea/1.7.1-p1/bundle/config/schema.yaml
@@ -159,15 +159,11 @@ antrea_interworking:
     #@schema/desc "base64 encoded data"
     nsxKey: ZHVtbXlQYXNzd29yZA==
     #@schema/desc " "
-    ClusterName: dummyClusterName
+    clusterName: dummyClusterName
     #@schema/desc " "
-    NSXIP1: dummyNSXIP1
+    NSXManagers: [dummyNSXIP1]
     #@schema/desc " "
-    NSXIP2: dummyNSXIP2
-    #@schema/desc " "
-    NSXIP3: dummyNSXIP3
-    #@schema/desc " "
-    VPCPath: dummyVPCPath
+    vpcPath: dummyVPCPath
     #@schema/desc " "
     mp_adapter_conf:
       #@schema/desc " "

diff --git a/addons/packages/antrea/1.7.1-p1/bundle/config/values.yaml b/addons/packages/antrea/1.7.1-p1/bundle/config/values.yaml
@@ -80,11 +80,9 @@ antrea_interworking:
     nsxKey: ZHVtbXlQYXNzd29yZA==
     nsxUser: ZHVtbXlBZG1pbg==
     nsxPassword: ZHVtbXlQYXNzd29yZA==
-    ClusterName: dummyClusterName
-    NSXIP1: dummyNSXIP1
-    NSXIP2: dummyNSXIP2
-    NSXIP3: dummyNSXIP3
-    VPCPath: dummyVPCPath
+    clusterName: dummyClusterName
+    NSXManagers: []
+    vpcPath: dummyVPCPath
     mp_adapter_conf:
       NSXClientTimeout: 120
       InventoryBatchSize: 50

diff --git a/addons/packages/antrea/1.7.1-p1/package.yaml b/addons/packages/antrea/1.7.1-p1/package.yaml
@@ -358,23 +358,18 @@ spec:
                   type: string
                   description: base64 encoded data
                   default: ZHVtbXlQYXNzd29yZA==
-                ClusterName:
+                clusterName:
                   type: string
                   description: ' '
                   default: dummyClusterName
-                NSXIP1:
-                  type: string
-                  description: ' '
-                  default: dummyNSXIP1
-                NSXIP2:
-                  type: string
-                  description: ' '
-                  default: dummyNSXIP2
-                NSXIP3:
-                  type: string
+                NSXManagers:
+                  type: array
                   description: ' '
-                  default: dummyNSXIP3
-                VPCPath:
+                  items:
+                    type: string
+                    default: dummyNSXIP1
+                  default: []
+                vpcPath:
                   type: string
                   description: ' '
                   default: dummyVPCPath

diff --git a/addons/packages/antrea/1.7.1-p1/test/interworking/antrea-interworking_suite_test.go b/addons/packages/antrea/1.7.1-p1/test/interworking/antrea-interworking_suite_test.go
@@ -16,15 +16,13 @@ type AntreaInterworkingConfig struct {
 	} `yaml:"antrea_nsx"`
 	AntreaInterworking struct {
 		Config struct {
-			NsxCert       string `yaml:"nsxCert"`
-			NSXKey        string `yaml:"nsxKey"`
-			NSXUser       string `yaml:"nsxUser"`
-			NSXPassword   string `yaml:"nsxPassword"`
-			ClusterName   string `yaml:"ClusterName"`
-			NSXIP1        string `yaml:"NSXIP1"`
-			NSXIP2        string `yaml:"NSXIP2"`
-			NSXIP3        string `yaml:"NSXIP3"`
-			VPCPath       string `yaml:"VPCPath"`
+			NsxCert       string   `yaml:"nsxCert"`
+			NSXKey        string   `yaml:"nsxKey"`
+			NSXUser       string   `yaml:"nsxUser"`
+			NSXPassword   string   `yaml:"nsxPassword"`
+			ClusterName   string   `yaml:"clusterName"`
+			NSXManagers   []string `yaml:"NSXManagers"`
+			vpcPath       string   `yaml:"vpcPath"`
 			MpAdapterConf struct {
 				NSXClientTimeout     int  `yaml:"NSXClientTimeout"`
 				InventoryBatchSize   int  `yaml:"InventoryBatchSize"`

diff --git a/addons/packages/antrea/1.7.1-p1/test/interworking/antrea-interworking_test.go b/addons/packages/antrea/1.7.1-p1/test/interworking/antrea-interworking_test.go
@@ -103,7 +103,7 @@ var _ = ginkgo.Describe("Antrea-interworking YTT Templates", func() {
 		output    string
 		err       error
 
-		configDir                                  = filepath.Join(repo.RootDir(), "addons/packages/antrea/1.7.1/bundle/config")
+		configDir                                  = filepath.Join(repo.RootDir(), "addons/packages/antrea/1.7.1-p1/bundle/config")
 		fileAntreaInterworkingYaml                 = filepath.Join(configDir, "upstream/interworking.yaml")
 		fileAntreaInterworkingBootstrapYaml        = filepath.Join(configDir, "upstream/bootstrap.yaml")
 		fileAntreaInterworkingOverlayYaml          = filepath.Join(configDir, "overlay/interworking-overlay.yaml")