fix(builtin): de-dupe various hcl annotation keys

Co-authored-by: Greg Hoin <[email protected]>

Author: jgwhite

internal/installutil/k8s/k8s.go

@@ -9,13 +9,14 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/waypoint-plugin-sdk/terminal"
-	"github.com/hashicorp/waypoint/internal/clierrors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
+
+	"github.com/hashicorp/waypoint-plugin-sdk/terminal"
+	"github.com/hashicorp/waypoint/internal/clierrors"
 )
 
 type K8sConfig struct {
@@ -26,7 +27,7 @@ type K8sConfig struct {
 	RunnerImage          string `hcl:"runner_image,optional"`
 	CpuRequest           string `hcl:"runner_cpu_request,optional"`
 	MemRequest           string `hcl:"runner_mem_request,optional"`
-	CreateServiceAccount bool   `hcl:"odr_service_account_init,optional"`
+	CreateServiceAccount bool   `hcl:"create_service_account,optional"`
 	OdrImage             string `hcl:"odr_image"`
 
 	// Required for backwards compatibility

internal/runnerinstall/nomad.go

@@ -34,7 +34,7 @@ type NomadConfig struct {
 
 	RunnerImage string `hcl:"runner_image,optional"`
 
-	Region         string   `hcl:"namespace,optional"`
+	Region         string   `hcl:"region,optional"`
 	Datacenters    []string `hcl:"datacenters,optional"`
 	PolicyOverride bool     `hcl:"policy_override,optional"`
 

internal/serverinstall/nomad.go

@@ -54,7 +54,7 @@ type nomadConfig struct {
 	consulServiceUITags      []string `hcl:"consul_service_ui_tags:optional"`
 	consulServiceBackendTags []string `hcl:"consul_service_backend_tags:optional"`
 	consulDatacenter         string   `hcl:"consul_datacenter,optional"`
-	consulDomain             string   `hcl:"consul_datacenter,optional"`
+	consulDomain             string   `hcl:"consul_domain,optional"`
 	consulToken              string   `hcl:"consul_token,optional"`
 
 	// If set along with consul, will use this hostname instead of
@@ -63,7 +63,7 @@ type nomadConfig struct {
 
 	odrImage string `hcl:"odr_image,optional"`
 
-	region         string   `hcl:"namespace,optional"`
+	region         string   `hcl:"region,optional"`
 	datacenters    []string `hcl:"datacenters,optional"`
 	policyOverride bool     `hcl:"policy_override,optional"`