diff --git a/charts/emissary-ingress/crds/getambassador.io_authservices.yaml b/charts/emissary-ingress/crds/getambassador.io_authservices.yaml index 7b9ba3200d..eb4c7ef1e8 100644 --- 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 index 9418f5ffde..344f6fe689 100644 --- 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 index 9418f5ffde..344f6fe689 100644 --- 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 index 5ffffec60c..817e01e460 100644 --- 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 index 6bc6f9613a..3bc57f53df 100644 --- a/pkg/api/getambassador.io/v2/zz_generated.deepcopy.go +++ b/pkg/api/getambassador.io/v2/zz_generated.deepcopy.go @@ -292,9 +292,9 @@ func (in *AuthServiceSpec) DeepCopyInto(out *AuthServiceSpec) { } if in.InitialMetadata != nil { in, out := &in.InitialMetadata, &out.InitialMetadata - *out = make(map[string]BoolOrString, len(*in)) + *out = make(map[string]string, len(*in)) for key, val := range *in { - (*out)[key] = *val.DeepCopy() + (*out)[key] = val } } if in.AllowRequestBody != nil { diff --git a/python/schemas/v2/AuthService.schema b/python/schemas/v2/AuthService.schema index ed6d85a0e6..45e7efdb10 100644 --- 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" },