Bump deps temp

go.mod

@@ -44,3 +44,6 @@ require (
 	knative.dev/pkg v0.0.0-20220411234407-00c122e376d0
 	sigs.k8s.io/yaml v1.3.0
 )
+
+// DO_NOT_SUBMIT
+replace knative.dev/networking => knative.dev/networking v0.0.0-20220412073408-56c4a3e1329c

go.sum

@@ -2136,13 +2136,11 @@ knative.dev/caching v0.0.0-20220411131818-6ad8cd321297 h1:TraCs8TV4qJKBwIIUcsnED
 knative.dev/caching v0.0.0-20220411131818-6ad8cd321297/go.mod h1:UKu93lk0Q3wEioNoNn+dNOkTV++n74IZvzltz+ViC9w=
 knative.dev/hack v0.0.0-20220328133751-f06773764ce3/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
 knative.dev/hack v0.0.0-20220407171644-0e0784b13cef/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
-knative.dev/hack v0.0.0-20220411013954-02c525c25eb7/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
 knative.dev/hack v0.0.0-20220411131823-6ffd8417de7c h1:aXsFXeky/GccNQxwf72CS4NR3EoqTqsCVNKQnblfwr0=
 knative.dev/hack v0.0.0-20220411131823-6ffd8417de7c/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
-knative.dev/networking v0.0.0-20220412000408-f96f8e279f5e h1:UjkMVhsDxexaGTf65bZrQ0L+IEAxsOu6yYSPGkN1D6A=
-knative.dev/networking v0.0.0-20220412000408-f96f8e279f5e/go.mod h1:ObHKllP+immfcmyPBOAsm76PUIwsBr1ryac8ix4A0hE=
+knative.dev/networking v0.0.0-20220412073408-56c4a3e1329c h1:/5d1H1iZWSmCZUku/Q3OQFW4KJmDC5E45dPEE1r20JQ=
+knative.dev/networking v0.0.0-20220412073408-56c4a3e1329c/go.mod h1:W7P8RzTcmW/KQ9xAtiNicHaR30/aO6NpvRjFLyIbIeg=
 knative.dev/pkg v0.0.0-20220407210145-4d62e1dbb943/go.mod h1:0A5D5tOLettuVoi5x+0SLGRfrvVemXXtLH247WupPJk=
-knative.dev/pkg v0.0.0-20220411053220-ca82d2bbb2da/go.mod h1:0A5D5tOLettuVoi5x+0SLGRfrvVemXXtLH247WupPJk=
 knative.dev/pkg v0.0.0-20220411234407-00c122e376d0 h1:dY5DItNU5gQGFddsxkGQvBt4Zu1cZWE7irhNV9rYHpU=
 knative.dev/pkg v0.0.0-20220411234407-00c122e376d0/go.mod h1:0A5D5tOLettuVoi5x+0SLGRfrvVemXXtLH247WupPJk=
 mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48=

vendor/knative.dev/networking/config/config-network.yaml

@@ -22,7 +22,7 @@ metadata:
     app.kubernetes.io/component: networking
     app.kubernetes.io/version: devel
   annotations:
-    knative.dev/example-checksum: "7c86cb6a"
+    knative.dev/example-checksum: "d0b91f80"
 data:
   _example: |
     ################################
@@ -188,3 +188,35 @@ data:
     # NOTE: This flag is in an alpha state and is mostly here to enable internal testing
     #       for now. Use with caution.
     activator-san: ""
+
+    # The server certificates to serve the TLS traffic from ingress to activator.
+    # It is specified by the secret name, which has the "tls.crt" and "tls.key" data field.
+    # Use an empty value to disable the feature (default).
+    #
+    # NOTE: This flag is in an alpha state and is mostly here to enable internal testing
+    #       for now. Use with caution.
+    activator-cert-secret: ""
+
+    # The CA public certificate used to sign the queue-proxy TLS certificate.
+    # It is specified by the secret name, which has the "ca.crt" data field.
+    # Use an empty value to disable the feature (default).
+    #
+    # NOTE: This flag is in an alpha state and is mostly here to enable internal testing
+    #       for now. Use with caution.
+    queue-proxy-ca: ""
+
+    # The SAN (Subject Alt Name) used to validate the activator TLS certificate.
+    # It must be set when "queue-proxy-ca" is specified.
+    # Use an empty value to disable the feature (default).
+    #
+    # NOTE: This flag is in an alpha state and is mostly here to enable internal testing
+    #       for now. Use with caution.
+    queue-proxy-san: ""
+
+    # The server certificates to serve the TLS traffic from activator to queue-proxy.
+    # It is specified by the secret name, which has the "tls.crt" and "tls.key" data field.
+    # Use an empty value to disable the feature (default).
+    #
+    # NOTE: This flag is in an alpha state and is mostly here to enable internal testing
+    #       for now. Use with caution.
+    queue-proxy-cert-secret: ""

vendor/knative.dev/networking/pkg/network.go

@@ -197,9 +197,9 @@ const (
 	// ActivatorSANKey is the config for the SAN used to validate the activator TLS certificate.
 	ActivatorSANKey = "activator-san"
 
-	// ActivatorServerCertKey is the config for the secret name, which stores certificates
+	// ActivatorCertKey is the config for the secret name, which stores certificates
 	// to serve the TLS traffic from ingress to activator.
-	ActivatorServerCertKey = "activator-server-certs"
+	ActivatorCertKey = "activator-cert-secret"
 
 	// QueueProxyCAKey is the config for the secret name, which stores CA public certificate used
 	// to sign the queue-proxy TLS certificate.
@@ -208,9 +208,9 @@ const (
 	// QueueProxySANKey is the config for the SAN used to validate the queue-proxy TLS certificate.
 	QueueProxySANKey = "queue-proxy-san"
 
-	// QueueProxyServerCertKey is the config for the secret name, which stores certificates
+	// QueueProxyCertKey is the config for the secret name, which stores certificates
 	// to serve the TLS traffic from activator to queue-proxy.
-	QueueProxyServerCertKey = "queue-proxy-server-certs"
+	QueueProxyCertKey = "queue-proxy-cert-secret"
 )
 
 // DomainTemplateValues are the available properties people can choose from
@@ -318,8 +318,8 @@ type Config struct {
 	// It is used only when ActivatorCA is specified.
 	ActivatorSAN string
 
-	// ActivatorSererCert defines the secret name of the server certificates to serve the TLS traffic from ingress to activator.
-	ActivatorServerCert string
+	// ActivatorCertSecret defines the secret name of the server certificates to serve the TLS traffic from ingress to activator.
+	ActivatorCertSecret string
 
 	// QueueProxyCA defines the secret name of the CA public certificate used to sign the queue-proxy TLS certificate.
 	// The traffic to queue-proxy is not encrypted if QueueProxyCA is empty.
@@ -329,8 +329,8 @@ type Config struct {
 	// It is used only when QueueProxyCA is specified.
 	QueueProxySAN string
 
-	// QueueProxyServerCert defines the secret name of the server certificates to serve the TLS traffic from activator to queue-proxy.
-	QueueProxyServerCert string
+	// QueueProxyCertSecret defines the secret name of the server certificates to serve the TLS traffic from activator to queue-proxy.
+	QueueProxyCertSecret string
 }
 
 // HTTPProtocol indicates a type of HTTP endpoint behavior
@@ -388,10 +388,10 @@ func defaultConfig() *Config {
 		MeshCompatibilityMode:         MeshCompatibilityModeAuto,
 		ActivatorCA:                   "",
 		ActivatorSAN:                  "",
-		ActivatorServerCert:           "",
+		ActivatorCertSecret:           "",
 		QueueProxyCA:                  "",
 		QueueProxySAN:                 "",
-		QueueProxyServerCert:          "",
+		QueueProxyCertSecret:          "",
 	}
 }
 
@@ -425,10 +425,10 @@ func NewConfigFromMap(data map[string]string) (*Config, error) {
 		cm.AsString(DefaultExternalSchemeKey, &nc.DefaultExternalScheme),
 		cm.AsString(ActivatorCAKey, &nc.ActivatorCA),
 		cm.AsString(ActivatorSANKey, &nc.ActivatorSAN),
-		cm.AsString(ActivatorServerCertKey, &nc.ActivatorServerCert),
+		cm.AsString(ActivatorCertKey, &nc.ActivatorCertSecret),
 		cm.AsString(QueueProxyCAKey, &nc.QueueProxyCA),
 		cm.AsString(QueueProxySANKey, &nc.QueueProxySAN),
-		cm.AsString(QueueProxyServerCertKey, &nc.QueueProxyServerCert),
+		cm.AsString(QueueProxyCertKey, &nc.QueueProxyCertSecret),
 		asMode(MeshCompatibilityModeKey, &nc.MeshCompatibilityMode),
 		asLabelSelector(NamespaceWildcardCertSelectorKey, &nc.NamespaceWildcardCertSelector),
 	); err != nil {

vendor/modules.txt

@@ -1068,7 +1068,7 @@ knative.dev/caching/pkg/client/listers/caching/v1alpha1
 ## explicit
 knative.dev/hack
 knative.dev/hack/shell
-# knative.dev/networking v0.0.0-20220412000408-f96f8e279f5e
+# knative.dev/networking v0.0.0-20220412000408-f96f8e279f5e => knative.dev/networking v0.0.0-20220412073408-56c4a3e1329c
 ## explicit
 knative.dev/networking/config
 knative.dev/networking/pkg
@@ -1221,3 +1221,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.3.0
 ## explicit
 sigs.k8s.io/yaml
+# knative.dev/networking => knative.dev/networking v0.0.0-20220412073408-56c4a3e1329c