change initial_metadata type

Signed-off-by: Ryan Burn <[email protected]>
emissary-ingress · Aug 3, 2021 · c0c61cd · c0c61cd
1 parent b54b695
commit c0c61cd
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 16 deletions.
diff --git a/charts/emissary-ingress/crds/getambassador.io_authservices.yaml b/charts/emissary-ingress/crds/getambassador.io_authservices.yaml
@@ -78,10 +78,7 @@ spec:
               type: object
             initial_metadata:
               additionalProperties:
-                description: BoolOrString is a type that can hold a Boolean or a string.
-                oneOf:
-                - type: string
-                - type: boolean
+                type: string
               type: object
             path_prefix:
               type: string

diff --git a/manifests/emissary/ambassador-crds.yaml b/manifests/emissary/ambassador-crds.yaml
@@ -77,10 +77,7 @@ spec:
               type: object
             initial_metadata:
               additionalProperties:
-                description: BoolOrString is a type that can hold a Boolean or a string.
-                oneOf:
-                - type: string
-                - type: boolean
+                type: string
               type: object
             path_prefix:
               type: string

diff --git a/manifests/emissary/emissary-crds.yaml b/manifests/emissary/emissary-crds.yaml
@@ -77,10 +77,7 @@ spec:
               type: object
             initial_metadata:
               additionalProperties:
-                description: BoolOrString is a type that can hold a Boolean or a string.
-                oneOf:
-                - type: string
-                - type: boolean
+                type: string
               type: object
             path_prefix:
               type: string

diff --git a/pkg/api/getambassador.io/v2/authservice_types.go b/pkg/api/getambassador.io/v2/authservice_types.go
@@ -51,7 +51,7 @@ type AuthServiceSpec struct {
 	AllowedRequestHeaders       []string                  `json:"allowed_request_headers,omitempty"`
 	AllowedAuthorizationHeaders []string                  `json:"allowed_authorization_headers,omitempty"`
 	AddAuthHeaders              map[string]BoolOrString   `json:"add_auth_headers,omitempty"`
-	InitialMetadata             map[string]BoolOrString   `json:"initial_metadata,omitempty"`
+	InitialMetadata             map[string]string         `json:"initial_metadata,omitempty"`
 	AllowRequestBody            *bool                     `json:"allow_request_body,omitempty"`
 	AddLinkerdHeaders           *bool                     `json:"add_linkerd_headers,omitempty"`
 	FailureModeAllow            *bool                     `json:"failure_mode_allow,omitempty"`

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/schemas/v2/AuthService.schema b/python/schemas/v2/AuthService.schema
@@ -42,7 +42,7 @@
         },
         "initial_metadata": {
             "type": "object",
-            "additionalProperties": { "type": [ "string", "boolean" ] }
+            "additionalProperties": { "type": "string" }
         },
         "allow_request_body": { "type": "boolean" },
         "add_linkerd_headers": { "type": "boolean" },