mirror of https://github.com/knative/client.git
upgrade to latest dependencies (#1650)
bumping knative.dev/serving 674c1c6...e75bcf0: > e75bcf0 upgrade to latest dependencies (# 12846) > d9ab756 Update net-gateway-api nightly (# 12816) > 52097ba upgrade to latest dependencies (# 12839) > 5021d8c Update net-contour nightly (# 12819) bumping knative.dev/eventing e874b89...2222324: > 2222324 Update actions (# 6323) > e7459cb upgrade to latest dependencies (# 6324) bumping knative.dev/pkg 00c122e...e325df6: > e325df6 upgrade to latest dependencies (# 2490) bumping knative.dev/networking f96f8e2...1145ec5: > 1145ec5 upgrade to latest dependencies (# 658) > 56c4a3e upgrade to latest dependencies (# 657) > c173eed Add certificates config keys in config-network (# 648) Signed-off-by: Knative Automation <automation@knative.team>
This commit is contained in:
parent
0993e23fed
commit
b4e95db7a3
8
go.mod
8
go.mod
|
|
@ -20,10 +20,10 @@ require (
|
|||
k8s.io/cli-runtime v0.23.4
|
||||
k8s.io/client-go v0.23.5
|
||||
k8s.io/code-generator v0.23.5
|
||||
knative.dev/eventing v0.30.1-0.20220411142907-e874b89d6d56
|
||||
knative.dev/eventing v0.30.1-0.20220412073008-22223245a4a4
|
||||
knative.dev/hack v0.0.0-20220411131823-6ffd8417de7c
|
||||
knative.dev/networking v0.0.0-20220412000408-f96f8e279f5e
|
||||
knative.dev/pkg v0.0.0-20220411234407-00c122e376d0
|
||||
knative.dev/serving v0.30.1-0.20220412010722-674c1c610ed6
|
||||
knative.dev/networking v0.0.0-20220412163509-1145ec58c8be
|
||||
knative.dev/pkg v0.0.0-20220412134708-e325df66cb51
|
||||
knative.dev/serving v0.30.1-0.20220412142308-e75bcf0ee860
|
||||
sigs.k8s.io/yaml v1.3.0
|
||||
)
|
||||
|
|
|
|||
30
go.sum
30
go.sum
|
|
@ -2181,27 +2181,23 @@ k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
|
|||
k8s.io/utils v0.0.0-20220127004650-9b3446523e65/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
|
||||
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc=
|
||||
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
|
||||
knative.dev/caching v0.0.0-20220407170246-0e965e4c948f/go.mod h1:Bpn+FhncxYI6r2X4OuJ0fyUeNMyfdQmYLEVHQxYqvNo=
|
||||
knative.dev/eventing v0.30.1-0.20220411142907-e874b89d6d56 h1:AEt76KgwdxCrJmnvtQdU3mO5FVY0qWce56EpaFLJSUE=
|
||||
knative.dev/eventing v0.30.1-0.20220411142907-e874b89d6d56/go.mod h1:BGFxvInA40GsYeMBERaOjVq97kFJwubFO/A/dOdXtSg=
|
||||
knative.dev/hack v0.0.0-20220224013837-e1785985d364/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
|
||||
knative.dev/caching v0.0.0-20220412015107-318083f279be/go.mod h1:FqsgCB99NLJq1c8ZtpHYAb/3Oalgko9i4nF45IiKPio=
|
||||
knative.dev/eventing v0.30.1-0.20220412073008-22223245a4a4 h1:037hkBCKqsGcLA95hUVGnLRX5Xviy0hW9Ws8ZBDd83E=
|
||||
knative.dev/eventing v0.30.1-0.20220412073008-22223245a4a4/go.mod h1:C1vLgthI00ev8zSqToU/sVgI6LI0ZQgezs0GX9uZ8l8=
|
||||
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/hack/schema v0.0.0-20220411013954-02c525c25eb7/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0=
|
||||
knative.dev/networking v0.0.0-20220407165945-7307ffd0a8eb/go.mod h1:5mOmDZAOLZ4spdHWoiRpjIVCSWuA8V4NYIVtFycdSn8=
|
||||
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/pkg v0.0.0-20220325200448-1f7514acd0c2/go.mod h1:5xt0nzCwxvQ2N4w71smY7pYm5nVrQ8qnRsMinSLVpio=
|
||||
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/hack/schema v0.0.0-20220411131823-6ffd8417de7c/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0=
|
||||
knative.dev/networking v0.0.0-20220412073408-56c4a3e1329c/go.mod h1:W7P8RzTcmW/KQ9xAtiNicHaR30/aO6NpvRjFLyIbIeg=
|
||||
knative.dev/networking v0.0.0-20220412163509-1145ec58c8be h1:MmwR4SfwlXgt/jnjronkTTOKBrwN1mP/VNhHH08pIoc=
|
||||
knative.dev/networking v0.0.0-20220412163509-1145ec58c8be/go.mod h1:6OZIUimxPelIIudzHWRd+Lc7ippC5t+DC8CsZKCOjcI=
|
||||
knative.dev/pkg v0.0.0-20220411131850-75629c8ab60e/go.mod h1:0A5D5tOLettuVoi5x+0SLGRfrvVemXXtLH247WupPJk=
|
||||
knative.dev/pkg v0.0.0-20220411234407-00c122e376d0/go.mod h1:0A5D5tOLettuVoi5x+0SLGRfrvVemXXtLH247WupPJk=
|
||||
knative.dev/reconciler-test v0.0.0-20220411014048-490effc323f3/go.mod h1:lpugBzYOTtwVbTS+UHDG8oCBEb6mRsBnJm7Lp/Yhcq4=
|
||||
knative.dev/serving v0.30.1-0.20220412010722-674c1c610ed6 h1:LmkXYqmQNRQfL9RVtxQ1YUhHRDTc0HK5bHKFpPrErUk=
|
||||
knative.dev/serving v0.30.1-0.20220412010722-674c1c610ed6/go.mod h1:lrBIaI6Qz1NFQK3bAs1pR1NsvMpIp9219Rk3qFZg49g=
|
||||
knative.dev/pkg v0.0.0-20220412134708-e325df66cb51 h1:4AmaxeY7+r/PYYz3HS9pMY21Mw3ykO6STLFEk2FoJ2s=
|
||||
knative.dev/pkg v0.0.0-20220412134708-e325df66cb51/go.mod h1:j2MeD8s+JoCu1vegX80GbRXV/xd20Jm1NznxBYtVXiM=
|
||||
knative.dev/reconciler-test v0.0.0-20220411142808-55eab02440e9/go.mod h1:gH/ghOMDp7c2I2EAAhH4kYh0MI2hJ75OtiAMfeSl85o=
|
||||
knative.dev/serving v0.30.1-0.20220412142308-e75bcf0ee860 h1:r6Nim2Kruuu/FugWpwdxfX4Qh0LmR7iRLpfUk4msnAg=
|
||||
knative.dev/serving v0.30.1-0.20220412142308-e75bcf0ee860/go.mod h1:b+wL9MBshkUyn8q7SCo+swF6qfrsaWG7cDa/AWuI4Nw=
|
||||
mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48=
|
||||
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
|
||||
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
|
||||
|
|
|
|||
|
|
@ -196,6 +196,21 @@ const (
|
|||
|
||||
// ActivatorSANKey is the config for the SAN used to validate the activator TLS certificate.
|
||||
ActivatorSANKey = "activator-san"
|
||||
|
||||
// ActivatorCertKey is the config for the secret name, which stores certificates
|
||||
// to serve the TLS traffic from ingress to activator.
|
||||
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.
|
||||
QueueProxyCAKey = "queue-proxy-ca"
|
||||
|
||||
// QueueProxySANKey is the config for the SAN used to validate the queue-proxy TLS certificate.
|
||||
QueueProxySANKey = "queue-proxy-san"
|
||||
|
||||
// QueueProxyCertKey is the config for the secret name, which stores certificates
|
||||
// to serve the TLS traffic from activator to queue-proxy.
|
||||
QueueProxyCertKey = "queue-proxy-cert-secret"
|
||||
)
|
||||
|
||||
// DomainTemplateValues are the available properties people can choose from
|
||||
|
|
@ -302,6 +317,20 @@ type Config struct {
|
|||
// ActivatorSAN defines the SAN (Subject Alt Name) used to validate the activator TLS certificate.
|
||||
// It is used only when ActivatorCA is specified.
|
||||
ActivatorSAN 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.
|
||||
QueueProxyCA string
|
||||
|
||||
// QueueProxySAN defines the SAN (Subject Alt Name) used to validate the queue-proxy TLS certificate.
|
||||
// It is used only when QueueProxyCA is specified.
|
||||
QueueProxySAN 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
|
||||
|
|
@ -359,6 +388,10 @@ func defaultConfig() *Config {
|
|||
MeshCompatibilityMode: MeshCompatibilityModeAuto,
|
||||
ActivatorCA: "",
|
||||
ActivatorSAN: "",
|
||||
ActivatorCertSecret: "",
|
||||
QueueProxyCA: "",
|
||||
QueueProxySAN: "",
|
||||
QueueProxyCertSecret: "",
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -392,6 +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(ActivatorCertKey, &nc.ActivatorCertSecret),
|
||||
cm.AsString(QueueProxyCAKey, &nc.QueueProxyCA),
|
||||
cm.AsString(QueueProxySANKey, &nc.QueueProxySAN),
|
||||
cm.AsString(QueueProxyCertKey, &nc.QueueProxyCertSecret),
|
||||
asMode(MeshCompatibilityModeKey, &nc.MeshCompatibilityMode),
|
||||
asLabelSelector(NamespaceWildcardCertSelectorKey, &nc.NamespaceWildcardCertSelector),
|
||||
); err != nil {
|
||||
|
|
@ -456,6 +493,14 @@ func NewConfigFromMap(data map[string]string) (*Config, error) {
|
|||
return nil, fmt.Errorf("%q must be set when %q was set", ActivatorCAKey, ActivatorSANKey)
|
||||
}
|
||||
|
||||
if nc.QueueProxyCA != "" && nc.QueueProxySAN == "" {
|
||||
return nil, fmt.Errorf("%q must be set when %q was set", QueueProxySANKey, QueueProxyCAKey)
|
||||
}
|
||||
|
||||
if nc.QueueProxyCA == "" && nc.QueueProxySAN != "" {
|
||||
return nil, fmt.Errorf("%q must be set when %q was set", QueueProxyCAKey, QueueProxySANKey)
|
||||
}
|
||||
|
||||
return nc, nil
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -789,7 +789,7 @@ k8s.io/utils/internal/third_party/forked/golang/net
|
|||
k8s.io/utils/net
|
||||
k8s.io/utils/pointer
|
||||
k8s.io/utils/trace
|
||||
# knative.dev/eventing v0.30.1-0.20220411142907-e874b89d6d56
|
||||
# knative.dev/eventing v0.30.1-0.20220412073008-22223245a4a4
|
||||
## explicit
|
||||
knative.dev/eventing/pkg/apis/config
|
||||
knative.dev/eventing/pkg/apis/duck
|
||||
|
|
@ -820,7 +820,7 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake
|
|||
# knative.dev/hack v0.0.0-20220411131823-6ffd8417de7c
|
||||
## explicit
|
||||
knative.dev/hack
|
||||
# knative.dev/networking v0.0.0-20220412000408-f96f8e279f5e
|
||||
# knative.dev/networking v0.0.0-20220412163509-1145ec58c8be
|
||||
## explicit
|
||||
knative.dev/networking/pkg
|
||||
knative.dev/networking/pkg/apis/networking
|
||||
|
|
@ -828,7 +828,7 @@ knative.dev/networking/pkg/apis/networking/v1alpha1
|
|||
knative.dev/networking/pkg/client/clientset/versioned
|
||||
knative.dev/networking/pkg/client/clientset/versioned/scheme
|
||||
knative.dev/networking/pkg/client/clientset/versioned/typed/networking/v1alpha1
|
||||
# knative.dev/pkg v0.0.0-20220411234407-00c122e376d0
|
||||
# knative.dev/pkg v0.0.0-20220412134708-e325df66cb51
|
||||
## explicit
|
||||
knative.dev/pkg/apis
|
||||
knative.dev/pkg/apis/duck
|
||||
|
|
@ -878,7 +878,7 @@ knative.dev/pkg/tracing/config
|
|||
knative.dev/pkg/tracing/propagation
|
||||
knative.dev/pkg/tracing/propagation/tracecontextb3
|
||||
knative.dev/pkg/tracker
|
||||
# knative.dev/serving v0.30.1-0.20220412010722-674c1c610ed6
|
||||
# knative.dev/serving v0.30.1-0.20220412142308-e75bcf0ee860
|
||||
## explicit
|
||||
knative.dev/serving/pkg/apis/autoscaling
|
||||
knative.dev/serving/pkg/apis/autoscaling/v1alpha1
|
||||
|
|
|
|||
Loading…
Reference in New Issue