[WIP] v4alpha1 CRDs

.golangci.yml

@@ -45,6 +45,9 @@ issues:
       text: "^tests: .* should return nothing$"
 run:
   timeout: 9m # CircleCI is slow?
+  skip-dirs:
+    - pkg/json
+    - pkg/yaml
 
 # I don't know of a linter that lets you blacklist specific functions
 # and variables within a package, but if one exists, I would like to

build-aux/generate.mk

@@ -37,6 +37,7 @@ generate-fast/files += $(OSS_HOME)/pkg/api/getambassador.io/v1/zz_generated.conv
 generate-fast/files += $(OSS_HOME)/pkg/api/getambassador.io/v2/zz_generated.conversion.go
 generate-fast/files += $(OSS_HOME)/pkg/api/getambassador.io/v2/zz_generated.conversion-spoke.go
 generate-fast/files += $(OSS_HOME)/pkg/api/getambassador.io/v3alpha1/zz_generated.conversion-hub.go
+generate-fast/files += $(OSS_HOME)/pkg/api/emissary-ingress.dev/v4alpha1/zz_generated.conversion-hub.go
 # Individual files: YAML
 generate-fast/files += $(OSS_HOME)/manifests/emissary/emissary-crds.yaml.in
 generate-fast/files += $(OSS_HOME)/manifests/emissary/emissary-emissaryns.yaml.in

cmd/entrypoint/ambassador_metainfo_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/emissary-ingress/emissary/v3/cmd/entrypoint"
-	amb "github.com/emissary-ingress/emissary/v3/pkg/api/getambassador.io/v3alpha1"
+	amb "github.com/emissary-ingress/emissary/v3/pkg/api/emissary-ingress.dev/v4alpha1"
 	"github.com/emissary-ingress/emissary/v3/pkg/kates"
 	"github.com/emissary-ingress/emissary/v3/pkg/snapshot/v1"
 )

cmd/entrypoint/consul.go

@@ -7,7 +7,7 @@
 
 	consulapi "github.com/hashicorp/consul/api"
 
-	amb "github.com/emissary-ingress/emissary/v3/pkg/api/getambassador.io/v3alpha1"
+	amb "github.com/emissary-ingress/emissary/v3/pkg/api/emissary-ingress.dev/v4alpha1"
 	"github.com/emissary-ingress/emissary/v3/pkg/consulwatch"
 	snapshotTypes "github.com/emissary-ingress/emissary/v3/pkg/snapshot/v1"
 )
@@ -41,7 +41,7 @@
 	var resolvers []*amb.ConsulResolver
 	for _, cr := range s.ConsulResolvers {
 		if cr.Spec.AmbassadorID.Matches(envAmbID) {
 			resolvers = append(resolvers, cr)
 		}
 	}
 
@@ -57,7 +57,7 @@
 		}
 	}
 
 	return consulWatcher.reconcile(ctx, s.ConsulResolvers, mappings)
 }
 
 type consulWatcher struct {

cmd/entrypoint/consul_test.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/datawire/dlib/dgroup"
 	"github.com/datawire/dlib/dlog"
-	amb "github.com/emissary-ingress/emissary/v3/pkg/api/getambassador.io/v3alpha1"
+	amb "github.com/emissary-ingress/emissary/v3/pkg/api/emissary-ingress.dev/v4alpha1"
 	"github.com/emissary-ingress/emissary/v3/pkg/consulwatch"
 	"github.com/emissary-ingress/emissary/v3/pkg/kates"
 	snapshotTypes "github.com/emissary-ingress/emissary/v3/pkg/snapshot/v1"

cmd/entrypoint/endpoint_routing_test.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/emissary-ingress/emissary/v3/cmd/entrypoint"
 	"github.com/emissary-ingress/emissary/v3/pkg/ambex"
-	amb "github.com/emissary-ingress/emissary/v3/pkg/api/getambassador.io/v3alpha1"
+	amb "github.com/emissary-ingress/emissary/v3/pkg/api/emissary-ingress.dev/v4alpha1"
 	"github.com/emissary-ingress/emissary/v3/pkg/kates"
 	"github.com/emissary-ingress/emissary/v3/pkg/snapshot/v1"
 	v3bootstrap "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3"

cmd/entrypoint/endpoints.go

@@ -9,7 +9,7 @@
 	"strings"
 
 	"github.com/datawire/dlib/dlog"
-	amb "github.com/emissary-ingress/emissary/v3/pkg/api/getambassador.io/v3alpha1"
+	amb "github.com/emissary-ingress/emissary/v3/pkg/api/emissary-ingress.dev/v4alpha1"
 	"github.com/emissary-ingress/emissary/v3/pkg/kates"
 	snapshotTypes "github.com/emissary-ingress/emissary/v3/pkg/snapshot/v1"
 )
@@ -92,7 +92,7 @@
 	// interested in.
 	for _, m := range s.Modules {
 		if m.Spec.AmbassadorID.Matches(envAmbID) {
 			eri.checkModule(ctx, m, "CRD")
 		}
 	}
 
@@ -138,13 +138,13 @@
 
 	for _, m := range s.Mappings {
 		if m.Spec.AmbassadorID.Matches(envAmbID) {
 			eri.checkMapping(ctx, m, "CRD")
 		}
 	}
 
 	for _, t := range s.TCPMappings {
 		if t.Spec.AmbassadorID.Matches(envAmbID) {
 			eri.checkTCPMapping(ctx, t, "CRD")
 		}
 	}
 }

cmd/entrypoint/host_semantic_test.go

@@ -11,16 +11,16 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/emissary-ingress/emissary/v3/cmd/entrypoint"
-	"github.com/emissary-ingress/emissary/v3/pkg/api/getambassador.io/v3alpha1"
+	amb "github.com/emissary-ingress/emissary/v3/pkg/api/emissary-ingress.dev/v4alpha1"
 	"github.com/emissary-ingress/emissary/v3/pkg/kates"
 	"github.com/emissary-ingress/emissary/v3/pkg/snapshot/v1"
 	bootstrap "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3"
 )
 
-func getExpected(expectedFile string, inputObjects []kates.Object) ([]RenderedListener, []v3alpha1.Mapping, []string, error) {
+func getExpected(expectedFile string, inputObjects []kates.Object) ([]RenderedListener, []amb.Mapping, []string, error) {
 	// Figure out all the mappings and clusters we'll need.
 	neededClusters := []string{}
-	neededMappings := []v3alpha1.Mapping{}
+	neededMappings := []amb.Mapping{}
 
 	// Read the expected rendering from a file.
 	content, err := ioutil.ReadFile(expectedFile)
@@ -38,7 +38,7 @@ func getExpected(expectedFile string, inputObjects []kates.Object) ([]RenderedLi
 
 	for _, obj := range inputObjects {
 		// Skip things that aren't Mappings.
-		mapping, ok := obj.(*v3alpha1.Mapping)
+		mapping, ok := obj.(*amb.Mapping)
 
 		if !ok {
 			continue

cmd/entrypoint/secrets.go

@@ -14,7 +14,7 @@
 
 	"github.com/datawire/dlib/derror"
 	"github.com/datawire/dlib/dlog"
-	amb "github.com/emissary-ingress/emissary/v3/pkg/api/getambassador.io/v3alpha1"
+	amb "github.com/emissary-ingress/emissary/v3/pkg/api/emissary-ingress.dev/v4alpha1"
 	"github.com/emissary-ingress/emissary/v3/pkg/kates"
 	"github.com/emissary-ingress/emissary/v3/pkg/snapshot/v1"
 	snapshotTypes "github.com/emissary-ingress/emissary/v3/pkg/snapshot/v1"
@@ -203,7 +203,7 @@
 	for _, h := range sh.k8sSnapshot.Hosts {
 		var id amb.AmbassadorID
 		if len(h.Spec.AmbassadorID) > 0 {
 			id = h.Spec.AmbassadorID
 		}
 		if id.Matches(envAmbID) {
 			resources = append(resources, h)

cmd/entrypoint/snapshot.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/datawire/dlib/dlog"
-	amb "github.com/emissary-ingress/emissary/v3/pkg/api/getambassador.io/v3alpha1"
+	amb "github.com/emissary-ingress/emissary/v3/pkg/api/emissary-ingress.dev/v4alpha1"
 	"github.com/emissary-ingress/emissary/v3/pkg/kates"
 	snapshotTypes "github.com/emissary-ingress/emissary/v3/pkg/snapshot/v1"
 )

cmd/entrypoint/testdata/Collision1.yaml

@@ -1,15 +1,14 @@
-# @TEMPLATE@
 ---
-apiVersion: getambassador.io/v3alpha1
+apiVersion: emissary-ingress.dev/v4alpha1
 kind: Host
 metadata:
   name: staging.upchieve.org
   namespace: default
 spec:
-  hostname: staging.upchieve.org
   acmeProvider:
     authority: none
     email: [email protected]
+  hostname: staging.upchieve.org
   requestPolicy:
     insecure:
       action: Route
@@ -19,66 +18,66 @@ spec:
 # metadata:
 #   name: staging
 ---
-apiVersion: getambassador.io/v3alpha1
+apiVersion: emissary-ingress.dev/v4alpha1
 kind: KubernetesEndpointResolver
 metadata:
   labels:
     app.kubernetes.io/managed-by: pulumi
   name: endpoint
   namespace: ambassador
 ---
-apiVersion: getambassador.io/v3alpha1
+apiVersion: emissary-ingress.dev/v4alpha1
 kind: Mapping
 metadata:
   name: subway-staging-socket-stable-mapping
   namespace: staging
 spec:
-  allow_upgrade:
+  allowUpgrade:
   - websocket
   host: staging.upchieve.org
-  load_balancer:
+  loadBalancer:
     policy: ring_hash
-    source_ip: true
+    sourceIP: true
   prefix: /
-  query_parameters:
-    transport: true
+  queryParameters:
+    transport: "true"
   resolver: endpoint
   service: subway-staging-stable.staging:3001
-  timeout_ms: 500000
+  timeoutMS: 500000
 ---
-apiVersion: getambassador.io/v3alpha1
+apiVersion: emissary-ingress.dev/v4alpha1
 kind: Mapping
 metadata:
   name: subway-staging-whiteboard-reset-stable-mapping
   namespace: staging
 spec:
   host: staging.upchieve.org
-  load_balancer:
+  loadBalancer:
     policy: ring_hash
-    source_ip: true
+    sourceIP: true
   prefix: /whiteboard/reset/
   resolver: endpoint
   rewrite: /whiteboard/reset/
   service: subway-staging-stable.staging:3000
-  timeout_ms: 500000
+  timeoutMS: 500000
 ---
-apiVersion: getambassador.io/v3alpha1
+apiVersion: emissary-ingress.dev/v4alpha1
 kind: Mapping
 metadata:
   name: subway-staging-whiteboard-stable-mapping
   namespace: staging
 spec:
-  allow_upgrade:
+  allowUpgrade:
   - websocket
   host: staging.upchieve.org
-  load_balancer:
+  loadBalancer:
     policy: ring_hash
-    source_ip: true
+    sourceIP: true
   prefix: /whiteboard/
   resolver: endpoint
   rewrite: /whiteboard/
   service: subway-staging-stable.staging:3000
-  timeout_ms: 500000
+  timeoutMS: 500000
 ---
 apiVersion: v1
 kind: Service

cmd/entrypoint/testdata/Collision1_v3.yaml

@@ -0,0 +1,120 @@
+# @TEMPLATE@
+---
+apiVersion: getambassador.io/v3alpha1
+kind: Host
+metadata:
+  name: staging.upchieve.org
+  namespace: default
+spec:
+  hostname: staging.upchieve.org
+  acmeProvider:
+    authority: none
+    email: [email protected]
+  requestPolicy:
+    insecure:
+      action: Route
+# ---
+# apiVersion: v1
+# kind: Namespace
+# metadata:
+#   name: staging
+---
+apiVersion: getambassador.io/v3alpha1
+kind: KubernetesEndpointResolver
+metadata:
+  labels:
+    app.kubernetes.io/managed-by: pulumi
+  name: endpoint
+  namespace: ambassador
+---
+apiVersion: getambassador.io/v3alpha1
+kind: Mapping
+metadata:
+  name: subway-staging-socket-stable-mapping
+  namespace: staging
+spec:
+  allow_upgrade:
+  - websocket
+  host: staging.upchieve.org
+  load_balancer:
+    policy: ring_hash
+    source_ip: true
+  prefix: /
+  query_parameters:
+    transport: "true"
+  resolver: endpoint
+  service: subway-staging-stable.staging:3001
+  timeout_ms: 500000
+---
+apiVersion: getambassador.io/v3alpha1
+kind: Mapping
+metadata:
+  name: subway-staging-whiteboard-reset-stable-mapping
+  namespace: staging
+spec:
+  host: staging.upchieve.org
+  load_balancer:
+    policy: ring_hash
+    source_ip: true
+  prefix: /whiteboard/reset/
+  resolver: endpoint
+  rewrite: /whiteboard/reset/
+  service: subway-staging-stable.staging:3000
+  timeout_ms: 500000
+---
+apiVersion: getambassador.io/v3alpha1
+kind: Mapping
+metadata:
+  name: subway-staging-whiteboard-stable-mapping
+  namespace: staging
+spec:
+  allow_upgrade:
+  - websocket
+  host: staging.upchieve.org
+  load_balancer:
+    policy: ring_hash
+    source_ip: true
+  prefix: /whiteboard/
+  resolver: endpoint
+  rewrite: /whiteboard/
+  service: subway-staging-stable.staging:3000
+  timeout_ms: 500000
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: subway-staging-stable
+  namespace: staging
+spec:
+  selector:
+    app: echo
+  ports:
+  - name: http
+    port: 3000
+    protocol: TCP
+    targetPort: 3000
+  sessionAffinity: ClientIP
+  type: ClusterIP
+# ---
+# apiVersion: apps/v1
+# kind: Deployment
+# metadata:
+#   name: echo
+#   namespace: staging
+# spec:
+#   replicas: 1
+#   selector:
+#     matchLabels:
+#       app: echo
+#   template:
+#     metadata:
+#       labels:
+#         app: echo
+#     spec:
+#       containers:
+#       - name: churn
+#         # image: {{image "echo/Dockerfile"}}
+#         image: churn:0.0.1
+#         command: ["echo-server"]
+#         ports:
+#         - containerPort: 3000

cmd/entrypoint/testdata/Collision2.yaml

@@ -1,14 +1,14 @@
 ---
-apiVersion: getambassador.io/v3alpha1
+apiVersion: emissary-ingress.dev/v4alpha1
 kind: Mapping
 metadata:
   name: subway-staging-stable-mapping
   namespace: staging
 spec:
   host: staging.upchieve.org
-  load_balancer:
+  loadBalancer:
     policy: least_request
   prefix: /
   resolver: endpoint
   service: subway-staging-stable.staging:3000
-  timeout_ms: 500000
+  timeoutMS: 500000

cmd/entrypoint/testdata/Collision2_v3.yaml

@@ -0,0 +1,14 @@
+---
+apiVersion: getambassador.io/v3alpha1
+kind: Mapping
+metadata:
+  name: subway-staging-stable-mapping
+  namespace: staging
+spec:
+  host: staging.upchieve.org
+  load_balancer:
+    policy: least_request
+  prefix: /
+  resolver: endpoint
+  service: subway-staging-stable.staging:3000
+  timeout_ms: 500000