Upgrade k8s.io/kube-openapi to fix support for rewrite: ""

This turned out to be an upstream bug in k8s.io/kube-openapi.  Upgrading
that package fixes the bug.

kubernetes/kube-openapi#230

Signed-off-by: Flynn <[email protected]>
Signed-off-by: Luke Shumaker <[email protected]>

Author: Flynn

CHANGELOG.md

@@ -89,6 +89,9 @@ Please see the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest
   `Mappings` that set `spec.cors.origins` to a string rather than a list of strings; this has been
   fixed, and these `Mappings` should once again function correctly.
 
+- Bugfix: Using `rewrite: ""` in a `Mapping` is correctly handled to mean "do not rewrite the path
+  at all".
+
 ## 2.1.1 not issued
 
 *Emissary-ingress 2.1.1 was not issued; Ambassador Edge Stack 2.1.1 uses Emissary-ingress 2.1.0.*

OPENSOURCE.md

@@ -111,7 +111,7 @@ following Free and Open Source software:
     k8s.io/component-base                                                     v0.20.2                                     Apache License 2.0
     k8s.io/gengo                                                              v0.0.0-20201214224949-b6c5ce23f027          Apache License 2.0
     k8s.io/klog/v2                                                            v2.10.0                                     Apache License 2.0
-    k8s.io/kube-openapi                                                       v0.0.0-20201113171705-d219536bb9fd          Apache License 2.0
+    k8s.io/kube-openapi                                                       v0.0.0-20210304212320-e467f52fd9db          Apache License 2.0
     k8s.io/kubectl                                                            v0.20.2                                     Apache License 2.0
     k8s.io/kubernetes                                                         v1.20.2                                     Apache License 2.0
     k8s.io/metrics                                                            v0.20.2                                     Apache License 2.0

docs/releaseNotes.yml

@@ -43,6 +43,13 @@ items:
           <code>spec.cors.origins</code> to a string rather than a list of strings; this has been
           fixed, and these <code>Mappings<code> should once again function correctly.
 
+      - title: Correctly handle empty rewrite in a Mapping
+        type: bugfix
+        body: >-
+          Using <code>rewrite: ""</code> in a <code>Mapping</code> is correctly handled
+          to mean "do not rewrite the path at all".
+        docs: topics/using/rewrites
+
   - version: 2.1.1
     date: 'N/A'
     notes:

go.mod

@@ -89,7 +89,7 @@ require (
 	k8s.io/client-go v0.20.2
 	k8s.io/code-generator v0.20.2
 	k8s.io/klog/v2 v2.10.0
-	k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
+	k8s.io/kube-openapi v0.0.0-20210304212320-e467f52fd9db
 	k8s.io/kubectl v0.20.2
 	k8s.io/kubernetes v1.20.2
 	k8s.io/metrics v0.20.2

go.sum

@@ -1115,6 +1115,8 @@ k8s.io/kube-controller-manager v0.20.2/go.mod h1:tEuBoNyKDqoHClDyLePZCs38XuVv5jC
 k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
 k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c=
 k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
+k8s.io/kube-openapi v0.0.0-20210304212320-e467f52fd9db h1:6eSQzsKNEqxmpqbul2YVDt5O4MPA+Q6RljtpWb536bE=
+k8s.io/kube-openapi v0.0.0-20210304212320-e467f52fd9db/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
 k8s.io/kube-proxy v0.20.2/go.mod h1:l75PYLoA+hI6WAfT/2cFPUcWy8XWMFGvsyw8UXCNuJc=
 k8s.io/kube-scheduler v0.20.2/go.mod h1:H21kpnQN7U3jRz/MwMxdGPC66UBuTibbq5LEy5AztBg=
 k8s.io/kubectl v0.20.2 h1:mXExF6N4eQUYmlfXJmfWIheCBLF6/n4VnwQKbQki5iE=

pkg/api/getambassador.io/validation_test.go

@@ -0,0 +1,45 @@
+package getambassadorio_test
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	getambassadorio "github.com/datawire/ambassador/v2/pkg/api/getambassador.io"
+	"github.com/datawire/ambassador/v2/pkg/kates"
+	"github.com/datawire/dlib/dlog"
+)
+
+func TestValidation(t *testing.T) {
+	jsonStr := `{
+    "apiVersion":"getambassador.io/v2",
+    "kind":"Mapping",
+    "metadata":{
+        "annotations":{
+            "kubectl.kubernetes.io/last-applied-configuration":"{\"apiVersion\":\"getambassador.io/v3alpha1\",\"kind\":\"Mapping\",\"metadata\":{\"annotations\":{},\"name\":\"quote-rewrite\",\"namespace\":\"default\"},\"spec\":{\"hostname\":\"*\",\"prefix\":\"/ffs/\",\"rewrite\":\"\",\"service\":\"quote\"}}"
+        },
+        "creationTimestamp":"2022-01-19T00:11:43Z",
+        "generation":1,
+        "name":"quote-rewrite",
+        "namespace":"default",
+        "uid":"01b3ddea-24d7-45c6-a05a-64386f1b9588"
+    },
+    "spec":{
+        "ambassador_id":[
+            "--apiVersion-v3alpha1-only--default"
+        ],
+        "prefix":"/ffs/",
+        "rewrite":"",
+        "service":"quote"
+    }
+}`
+
+	var obj kates.Unstructured
+	require.NoError(t, json.Unmarshal([]byte(jsonStr), &obj.Object))
+
+	validator := getambassadorio.NewValidator()
+	ctx := dlog.NewTestContext(t, true)
+
+	require.NoError(t, validator.Validate(ctx, &obj))
+}

vendor/k8s.io/kube-openapi/pkg/validation/validate/type.go

@@ -814,7 +814,7 @@ k8s.io/gengo/types
 # k8s.io/klog/v2 v2.10.0
 ## explicit; go 1.13
 k8s.io/klog/v2
-# k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
+# k8s.io/kube-openapi v0.0.0-20210304212320-e467f52fd9db
 ## explicit; go 1.12
 k8s.io/kube-openapi/pkg/common
 k8s.io/kube-openapi/pkg/util/proto