Add field in v2 for backwards compatibility

Signed-off-by: Paul Salaberria <[email protected]>
emissary-ingress · Apr 15, 2022 · f36a9c3 · f36a9c3
1 parent 66c957e
commit f36a9c3
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 1 deletion.
diff --git a/manifests/emissary/emissary-crds.yaml.in b/manifests/emissary/emissary-crds.yaml.in
@@ -3696,6 +3696,15 @@ spec:
                     type: boolean
                   trace_id_128bit:
                     type: boolean
+                  v3PropagationModes:
+                    items:
+                      enum:
+                      - ENVOY
+                      - LIGHTSTEP
+                      - B3
+                      - TRACE_CONTEXT
+                      type: string
+                    type: array
                 type: object
               driver:
                 enum:

diff --git a/pkg/api/getambassador.io/crds.yaml b/pkg/api/getambassador.io/crds.yaml
@@ -3755,6 +3755,15 @@ spec:
                     type: boolean
                   trace_id_128bit:
                     type: boolean
+                  v3PropagationModes:
+                    items:
+                      enum:
+                      - ENVOY
+                      - LIGHTSTEP
+                      - B3
+                      - TRACE_CONTEXT
+                      type: string
+                    type: array
                 type: object
               driver:
                 enum:

diff --git a/pkg/api/getambassador.io/v2/crd_tracingservice.go b/pkg/api/getambassador.io/v2/crd_tracingservice.go
@@ -20,6 +20,7 @@
 package v2
 
 import (
+	"github.com/datawire/ambassador/v2/pkg/api/getambassador.io/v3alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -39,6 +40,9 @@ type TraceConfig struct {
 	TraceID128Bit            *bool  `json:"trace_id_128bit,omitempty"`
 	SharedSpanContext        *bool  `json:"shared_span_context,omitempty"`
 	ServiceName              string `json:"service_name,omitempty"`
+
+	// +k8s:conversion-gen:rename=PropagationModes
+	V3PropagationModes []v3alpha1.PropagationMode `json:"v3PropagationModes,omitempty"`
 }
 
 // TracingServiceSpec defines the desired state of TracingService

diff --git a/pkg/api/getambassador.io/v2/zz_generated.conversion.go b/pkg/api/getambassador.io/v2/zz_generated.conversion.go
diff --git a/pkg/api/getambassador.io/v2/zz_generated.deepcopy.go b/pkg/api/getambassador.io/v2/zz_generated.deepcopy.go
diff --git a/python/tests/integration/manifests/crds.yaml b/python/tests/integration/manifests/crds.yaml
@@ -3605,6 +3605,15 @@ spec:
                     type: boolean
                   trace_id_128bit:
                     type: boolean
+                  v3PropagationModes:
+                    items:
+                      enum:
+                      - ENVOY
+                      - LIGHTSTEP
+                      - B3
+                      - TRACE_CONTEXT
+                      type: string
+                    type: array
                 type: object
               driver:
                 enum: