Rebase and update to upstream/main

knative · Jan 11, 2024 · bf85971 · bf85971
1 parent 3a23e08
commit bf85971
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 680 deletions.
diff --git a/pkg/reconciler/route/domains/domains.go b/pkg/reconciler/route/domains/domains.go
@@ -66,7 +66,7 @@ func GetAllDomainsAndTags(ctx context.Context, r *v1.Route, names []string, visi
 }
 
 // GetDomainsForVisibility return all domains for the specified visibility.
-func GetDomainsForVisibility(ctx context.Context, targetName string, r *v1.Route, visibility netv1alpha1.IngressVisibility) (sets.String, error) {
+func GetDomainsForVisibility(ctx context.Context, targetName string, r *v1.Route, visibility netv1alpha1.IngressVisibility) (sets.Set[string], error) {
  hostname, err := HostnameFromTemplate(ctx, r.Name, targetName)
  if err != nil {
  return nil, err
@@ -82,9 +82,9 @@ func GetDomainsForVisibility(ctx context.Context, targetName string, r *v1.Route
  }
  domains := []string{domain}
  if isClusterLocal {
- domains = ingress.ExpandedHosts(sets.NewString(domains...)).List()
+ domains = sets.List(ingress.ExpandedHosts(sets.New(domains...)))
  }
- return sets.NewString(domains...), err
+ return sets.New(domains...), err
 }
 
 // DomainNameFromTemplate generates domain name base on the template specified in the `config-network` ConfigMap.

diff --git a/pkg/reconciler/route/domains/domains_test.go b/pkg/reconciler/route/domains/domains_test.go
@@ -281,15 +281,15 @@ func TestGetDomainsForVisibility(t *testing.T) {
  visibility v1alpha1.IngressVisibility
  domainTemplate string
  tagTemplate string
- want sets.String
+ want sets.Set[string]
  }{
  {
  name: "default template - no tag - cluster-local",
  tag: "",
  visibility: v1alpha1.IngressVisibilityClusterLocal,
  domainTemplate: "{{.Name}}.{{.Namespace}}.{{.Domain}}",
  tagTemplate: "{{.Name}}-{{.Tag}}",
- want: sets.NewString(
+ want: sets.New(
  "myroute.default",
  "myroute.default.svc",
  "myroute.default.svc.cluster.local",
@@ -300,7 +300,7 @@ func TestGetDomainsForVisibility(t *testing.T) {
  visibility: v1alpha1.IngressVisibilityExternalIP,
  domainTemplate: "{{.Name}}.{{.Namespace}}.{{.Domain}}",
  tagTemplate: "{{.Name}}-{{.Tag}}",
- want: sets.NewString(
+ want: sets.New(
  "myroute.default.example.com",
  ),
  }, {
@@ -309,7 +309,7 @@ func TestGetDomainsForVisibility(t *testing.T) {
  visibility: v1alpha1.IngressVisibilityClusterLocal,
  domainTemplate: "{{.Name}}.{{.Namespace}}.{{.Domain}}",
  tagTemplate: "{{.Name}}-{{.Tag}}",
- want: sets.NewString(
+ want: sets.New(
  "myroute-test.default",
  "myroute-test.default.svc",
  "myroute-test.default.svc.cluster.local",
@@ -320,7 +320,7 @@ func TestGetDomainsForVisibility(t *testing.T) {
  visibility: v1alpha1.IngressVisibilityExternalIP,
  domainTemplate: "{{.Name}}.{{.Namespace}}.{{.Domain}}",
  tagTemplate: "{{.Name}}-{{.Tag}}",
- want: sets.NewString(
+ want: sets.New(
  "myroute-test.default.example.com",
  ),
  }, {
@@ -329,7 +329,7 @@ func TestGetDomainsForVisibility(t *testing.T) {
  visibility: v1alpha1.IngressVisibilityClusterLocal,
  domainTemplate: "{{.Name}}.{{.Namespace}}.{{.Domain}}",
  tagTemplate: "{{.Tag}}-{{.Name}}",
- want: sets.NewString(
+ want: sets.New(
  "myroute.default",
  "myroute.default.svc",
  "myroute.default.svc.cluster.local",
@@ -340,7 +340,7 @@ func TestGetDomainsForVisibility(t *testing.T) {
  visibility: v1alpha1.IngressVisibilityExternalIP,
  domainTemplate: "{{.Name}}.{{.Namespace}}.{{.Domain}}",
  tagTemplate: "{{.Tag}}-{{.Name}}",
- want: sets.NewString(
+ want: sets.New(
  "myroute.default.example.com",
  ),
  }, {
@@ -349,7 +349,7 @@ func TestGetDomainsForVisibility(t *testing.T) {
  visibility: v1alpha1.IngressVisibilityClusterLocal,
  domainTemplate: "{{.Name}}.{{.Namespace}}.{{.Domain}}",
  tagTemplate: "{{.Tag}}-{{.Name}}",
- want: sets.NewString(
+ want: sets.New(
  "test-myroute.default",
  "test-myroute.default.svc",
  "test-myroute.default.svc.cluster.local",
@@ -360,7 +360,7 @@ func TestGetDomainsForVisibility(t *testing.T) {
  visibility: v1alpha1.IngressVisibilityExternalIP,
  domainTemplate: "{{.Name}}.{{.Namespace}}.{{.Domain}}",
  tagTemplate: "{{.Tag}}-{{.Name}}",
- want: sets.NewString(
+ want: sets.New(
  "test-myroute.default.example.com",
  ),
  },

diff --git a/pkg/reconciler/route/resources/certificate.go b/pkg/reconciler/route/resources/certificate.go
@@ -88,7 +88,7 @@ func MakeCertificates(route *v1.Route, domainTagMap map[string]string, certClass
 
 // MakeClusterLocalCertificate creates a Knative Certificate
 // for cluster-local-domain-tls.
-func MakeClusterLocalCertificate(route *v1.Route, tag string, domains sets.String, certClass string) *networkingv1alpha1.Certificate {
+func MakeClusterLocalCertificate(route *v1.Route, tag string, domains sets.Set[string], certClass string) *networkingv1alpha1.Certificate {
  domainsOrdered := make(sort.StringSlice, 0, len(domains))
  for dnsName := range domains {
  domainsOrdered = append(domainsOrdered, dnsName)

diff --git a/pkg/reconciler/route/resources/certificate_test.go b/pkg/reconciler/route/resources/certificate_test.go
@@ -40,7 +40,7 @@ var (
  "v1-current.default.example.com": "current",
  }
  domain = "example.com"
- localDomains = sets.NewString("hello.namespace", "hello.namespace.svc", "hello.namespace.svc.cluster.local")
+ localDomains = sets.New("hello.namespace", "hello.namespace.svc", "hello.namespace.svc.cluster.local")
  route = Route("default", "route", WithRouteUID("12345"))
 )
 
@@ -155,7 +155,7 @@ func TestMakeClusterLocalCertificateNoTag(t *testing.T) {
  },
  },
  Spec: netv1alpha1.CertificateSpec{
- DNSNames: localDomains.List(),
+ DNSNames: sets.List(localDomains),
  Domain: "svc.cluster.local",
  SecretName: "route-12345-local",
  },
@@ -181,7 +181,7 @@ func TestMakeClusterLocalCertificateWithTag(t *testing.T) {
  },
  },
  Spec: netv1alpha1.CertificateSpec{
- DNSNames: localDomains.List(),
+ DNSNames: sets.List(localDomains),
  Domain: "svc.cluster.local",
  SecretName: "route-12345-73204161-local",
  },

diff --git a/pkg/reconciler/route/route.go b/pkg/reconciler/route/route.go
@@ -335,7 +335,7 @@ func (c *Reconciler) clusterLocalDomainTLS(ctx context.Context, r *v1.Route, tc
  }
 
  r.Status.MarkCertificateReady(cert.Name)
- tls = append(tls, resources.MakeIngressTLS(cert, localDomains.List()))
+ tls = append(tls, resources.MakeIngressTLS(cert, sets.List(localDomains)))
  } else {
  r.Status.MarkCertificateNotReady(cert)
  }

diff --git a/third_party/istio-latest/net-istio.yaml b/third_party/istio-latest/net-istio.yaml
@@ -1,4 +1,4 @@
-# Generated when HEAD was 6899886a7538b60ba29057907a26ad76b1d99be3
+# Generated when HEAD was 34c78f032e62c97ba0e23f9e0d93fe36775a7935
 #
 # Copyright 2019 The Knative Authors
 #
@@ -22,7 +22,7 @@ metadata:
  labels:
  app.kubernetes.io/component: net-istio
  app.kubernetes.io/name: knative-serving
- app.kubernetes.io/version: "20231207-6899886a"
+ app.kubernetes.io/version: "20240111-34c78f03"
  serving.knative.dev/controller: "true"
  networking.knative.dev/ingress-provider: istio
 rules:
@@ -54,7 +54,7 @@ metadata:
  labels:
  app.kubernetes.io/component: net-istio
  app.kubernetes.io/name: knative-serving
- app.kubernetes.io/version: "20231207-6899886a"
+ app.kubernetes.io/version: "20240111-34c78f03"
  networking.knative.dev/ingress-provider: istio
 spec:
  selector:
@@ -93,7 +93,7 @@ metadata:
  labels:
  app.kubernetes.io/component: net-istio
  app.kubernetes.io/name: knative-serving
- app.kubernetes.io/version: "20231207-6899886a"
+ app.kubernetes.io/version: "20240111-34c78f03"
  networking.knative.dev/ingress-provider: istio
 spec:
  selector:
@@ -114,7 +114,7 @@ metadata:
  labels:
  app.kubernetes.io/component: net-istio
  app.kubernetes.io/name: knative-serving
- app.kubernetes.io/version: "20231207-6899886a"
+ app.kubernetes.io/version: "20240111-34c78f03"
  networking.knative.dev/ingress-provider: istio
  experimental.istio.io/disable-gateway-port-translation: "true"
 spec:
@@ -149,7 +149,7 @@ metadata:
  labels:
  app.kubernetes.io/component: net-istio
  app.kubernetes.io/name: knative-serving
- app.kubernetes.io/version: "20231207-6899886a"
+ app.kubernetes.io/version: "20240111-34c78f03"
  networking.knative.dev/ingress-provider: istio
 data:
  # TODO(nghia): Extract the .svc.cluster.local suffix into its own config.
@@ -203,7 +203,7 @@ metadata:
  labels:
  app.kubernetes.io/component: net-istio
  app.kubernetes.io/name: knative-serving
- app.kubernetes.io/version: "20231207-6899886a"
+ app.kubernetes.io/version: "20240111-34c78f03"
  networking.knative.dev/ingress-provider: istio
 spec:
  selector:
@@ -221,7 +221,7 @@ metadata:
  labels:
  app.kubernetes.io/component: net-istio
  app.kubernetes.io/name: knative-serving
- app.kubernetes.io/version: "20231207-6899886a"
+ app.kubernetes.io/version: "20240111-34c78f03"
  networking.knative.dev/ingress-provider: istio
 spec:
  selector:
@@ -254,7 +254,7 @@ metadata:
  labels:
  app.kubernetes.io/component: net-istio
  app.kubernetes.io/name: knative-serving
- app.kubernetes.io/version: "20231207-6899886a"
+ app.kubernetes.io/version: "20240111-34c78f03"
  networking.knative.dev/ingress-provider: istio
 spec:
  selector:
@@ -271,14 +271,14 @@ spec:
  app: net-istio-controller
  app.kubernetes.io/component: net-istio
  app.kubernetes.io/name: knative-serving
- app.kubernetes.io/version: "20231207-6899886a"
+ app.kubernetes.io/version: "20240111-34c78f03"
  spec:
  serviceAccountName: controller
  containers:
  - name: controller
  # This is the Go import path for the binary that is containerized
  # and substituted here.
- image: gcr.io/knative-nightly/knative.dev/net-istio/cmd/controller@sha256:22d9062b950752a75d5e69d4dc2e1af76edf3c1e99be3dc0b496b59eb3e6c2ce
+ image: gcr.io/knative-nightly/knative.dev/net-istio/cmd/controller@sha256:4dab86aead9b9bead8412be158d179238db84f4b10a0b006589c954f1e98879b
  resources:
  requests:
  cpu: 30m
@@ -357,7 +357,7 @@ metadata:
  labels:
  app.kubernetes.io/component: net-istio
  app.kubernetes.io/name: knative-serving
- app.kubernetes.io/version: "20231207-6899886a"
+ app.kubernetes.io/version: "20240111-34c78f03"
  networking.knative.dev/ingress-provider: istio
 spec:
  selector:
@@ -371,14 +371,14 @@ spec:
  role: net-istio-webhook
  app.kubernetes.io/component: net-istio
  app.kubernetes.io/name: knative-serving
- app.kubernetes.io/version: "20231207-6899886a"
+ app.kubernetes.io/version: "20240111-34c78f03"
  spec:
  serviceAccountName: controller
  containers:
  - name: webhook
  # This is the Go import path for the binary that is containerized
  # and substituted here.
- image: gcr.io/knative-nightly/knative.dev/net-istio/cmd/webhook@sha256:1e5cafbb9dbbf58dd964106a6d65d57522d480053e7e7efab2074338a2a3516d
+ image: gcr.io/knative-nightly/knative.dev/net-istio/cmd/webhook@sha256:28692c7f7cad36f09758ef4c8d0e0cf098dec3a4b4d03433bc9e905625fdf80f
  resources:
  requests:
  cpu: 20m
@@ -462,7 +462,7 @@ metadata:
  labels:
  app.kubernetes.io/component: net-istio
  app.kubernetes.io/name: knative-serving
- app.kubernetes.io/version: "20231207-6899886a"
+ app.kubernetes.io/version: "20240111-34c78f03"
  networking.knative.dev/ingress-provider: istio
 
 ---
@@ -489,7 +489,7 @@ metadata:
  role: net-istio-webhook
  app.kubernetes.io/component: net-istio
  app.kubernetes.io/name: knative-serving
- app.kubernetes.io/version: "20231207-6899886a"
+ app.kubernetes.io/version: "20240111-34c78f03"
  networking.knative.dev/ingress-provider: istio
 spec:
  ports:
@@ -528,7 +528,7 @@ metadata:
  labels:
  app.kubernetes.io/component: net-istio
  app.kubernetes.io/name: knative-serving
- app.kubernetes.io/version: "20231207-6899886a"
+ app.kubernetes.io/version: "20240111-34c78f03"
  networking.knative.dev/ingress-provider: istio
 webhooks:
  - admissionReviewVersions:
@@ -567,7 +567,7 @@ metadata:
  labels:
  app.kubernetes.io/component: net-istio
  app.kubernetes.io/name: knative-serving
- app.kubernetes.io/version: "20231207-6899886a"
+ app.kubernetes.io/version: "20240111-34c78f03"
  networking.knative.dev/ingress-provider: istio
 webhooks:
  - admissionReviewVersions: