Merge pull request #105 from Juniper/ijohnson_switch_to_cas

Command backend is switched to command-app-server
Juniper · Apr 17, 2020 · 4a25487 · 4a25487
2 parents 2945330 + 3ae350c
commit 4a25487
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/pkg/controller/command/command_config.go b/pkg/controller/command/command_config.go
@@ -28,7 +28,7 @@ type commandConf struct {
 func (c *commandConf) FillConfigMap(cm *core.ConfigMap) {
 	cm.Data["bootstrap.sh"] = c.executeTemplate(commandInitBootstrapScript)
 	cm.Data["init_cluster.yml"] = c.executeTemplate(commandInitCluster)
-	cm.Data["contrail.yml"] = c.executeTemplate(commandConfig)
+	cm.Data["command-app-server.yml"] = c.executeTemplate(commandConfig)
 	cm.Data["entrypoint.sh"] = c.executeTemplate(commandEntrypoint)
 }
 
@@ -45,7 +45,7 @@ var commandEntrypoint = template.Must(template.New("").Parse(`
 #!/bin/bash
 cp {{ .CAFilePath }} /etc/pki/ca-trust/source/anchors/
 update-ca-trust
-/bin/contrailgo -c /etc/contrail/contrail.yml run
+/bin/commandappserver -c /etc/contrail/command-app-server.yml run
 `))
 
 var commandInitBootstrapScript = template.Must(template.New("").Parse(`
@@ -64,8 +64,8 @@ fi
 set -e
 psql -w -h ${MY_POD_IP} -U root -d contrail_test -f /usr/share/contrail/gen_init_psql.sql
 psql -w -h ${MY_POD_IP} -U {{ .PostgresUser }} -d {{ .PostgresDBName }} -f /usr/share/contrail/init_psql.sql
-contrailutil convert --intype yaml --in /usr/share/contrail/init_data.yaml --outtype rdbms -c /etc/contrail/contrail.yml
-contrailutil convert --intype yaml --in /etc/contrail/init_cluster.yml --outtype rdbms -c /etc/contrail/contrail.yml
+commandutil convert --intype yaml --in /usr/share/contrail/init_data.yaml --outtype rdbms -c /etc/contrail/command-app-server.yml
+commandutil convert --intype yaml --in /etc/contrail/init_cluster.yml --outtype rdbms -c /etc/contrail/command-app-server.yml
 `))
 
 var funcMap = template.FuncMap{

diff --git a/pkg/controller/command/command_controller.go b/pkg/controller/command/command_controller.go
@@ -226,7 +226,7 @@ func (r *ReconcileCommand) Reconcile(request reconcile.Request) (reconcile.Resul
 				Items: []core.KeyToPath{
 					{Key: "bootstrap.sh", Path: "bootstrap.sh", Mode: &executableMode},
 					{Key: "entrypoint.sh", Path: "entrypoint.sh", Mode: &executableMode},
-					{Key: "contrail.yml", Path: "contrail.yml"},
+					{Key: "command-app-server.yml", Path: "command-app-server.yml"},
 					{Key: "init_cluster.yml", Path: "init_cluster.yml"},
 				},
 			},

diff --git a/pkg/controller/command/command_controller_test.go b/pkg/controller/command/command_controller_test.go
@@ -617,7 +617,7 @@ func newDeployment(s apps.DeploymentStatus) *apps.Deployment {
 									Items: []core.KeyToPath{
 										{Key: "bootstrap.sh", Path: "bootstrap.sh", Mode: &executableMode},
 										{Key: "entrypoint.sh", Path: "entrypoint.sh", Mode: &executableMode},
-										{Key: "contrail.yml", Path: "contrail.yml"},
+										{Key: "command-app-server.yml", Path: "command-app-server.yml"},
 										{Key: "init_cluster.yml", Path: "init_cluster.yml"},
 									},
 								},
@@ -705,7 +705,7 @@ func assertConfigMap(t *testing.T, actual *core.ConfigMap) {
 		},
 	}, actual.ObjectMeta)
 
-	assert.Equal(t, expectedCommandConfig, actual.Data["contrail.yml"])
+	assert.Equal(t, expectedCommandConfig, actual.Data["command-app-server.yml"])
 	assert.Equal(t, expectedBootstrapScript, actual.Data["bootstrap.sh"])
 	assert.Equal(t, expectedCommandInitCluster, actual.Data["init_cluster.yml"])
 }
@@ -870,8 +870,8 @@ fi
 set -e
 psql -w -h ${MY_POD_IP} -U root -d contrail_test -f /usr/share/contrail/gen_init_psql.sql
 psql -w -h ${MY_POD_IP} -U root -d contrail_test -f /usr/share/contrail/init_psql.sql
-contrailutil convert --intype yaml --in /usr/share/contrail/init_data.yaml --outtype rdbms -c /etc/contrail/contrail.yml
-contrailutil convert --intype yaml --in /etc/contrail/init_cluster.yml --outtype rdbms -c /etc/contrail/contrail.yml
+commandutil convert --intype yaml --in /usr/share/contrail/init_data.yaml --outtype rdbms -c /etc/contrail/command-app-server.yml
+commandutil convert --intype yaml --in /etc/contrail/init_cluster.yml --outtype rdbms -c /etc/contrail/command-app-server.yml
 `
 
 const expectedCommandInitCluster = `

diff --git a/test/e2e/command_test.go b/test/e2e/command_test.go
@@ -159,8 +159,8 @@ func TestCommandServices(t *testing.T) {
 					KeystoneInstance:   "commandtest-keystone",
 					SwiftInstance:      "commandtest-swift",
 					Containers: map[string]*contrail.Container{
-						"init":                {Image: "registry:5000/contrail-command:master.1115"},
-						"api":                 {Image: "registry:5000/contrail-command:master.1115"},
+						"init":                {Image: "registry:5000/contrail-command:master.1175"},
+						"api":                 {Image: "registry:5000/contrail-command:master.1175"},
 						"wait-for-ready-conf": {Image: "registry:5000/busybox"},
 					},
 				},

diff --git a/test/e2e/settings.go b/test/e2e/settings.go
@@ -4,7 +4,7 @@ import "time"
 
 var (
 	retryInterval        = time.Second * 5
-	waitTimeout          = time.Second * 180
+	waitTimeout          = time.Second * 240
 	cleanupRetryInterval = time.Second * 1
 	cleanupTimeout       = time.Second * 5
 )
diff --git a/test/env/deploy/cluster.yaml b/test/env/deploy/cluster.yaml
@@ -195,9 +195,9 @@ spec:
           keystoneInstance: keystone
           containers:
             api:
-              image: registry:5000/contrail-command:master.1115
+              image: registry:5000/contrail-command:master.1175
             init:
-              image: registry:5000/contrail-command:master.1115
+              image: registry:5000/contrail-command:master.1175
             wait-for-ready-conf:
               image: registry:5000/busybox
     keystone:

diff --git a/test/env/update_local_registry.sh b/test/env/update_local_registry.sh
@@ -74,5 +74,5 @@ contrail-statusmonitor:master-180ab9
 contrail-provisioner:master.1175
 EOF
 
-pull_image hub.juniper.net/contrail-nightly contrail-command:master.1115
+pull_image hub.juniper.net/contrail-nightly contrail-command:master.1175
 pull_image hub.juniper.net/contrail-nightly contrail-controller-config-dnsmasq:master.1175