Update dependencies to v0.27.4 tag

discovery/aggregated_discovery.go

@@ -111,8 +111,6 @@ func convertAPIGroup(g apidiscovery.APIGroupDiscovery) (
 	return group, gvResources, failedGVs
 }
 
-var emptyKind = metav1.GroupVersionKind{}
-
 // convertAPIResource tranforms a APIResourceDiscovery to an APIResource. We are
 // resilient to missing GVK, since this resource might be the parent resource
 // for a subresource. If the parent is missing a GVK, it is not returned in
@@ -127,7 +125,7 @@ func convertAPIResource(in apidiscovery.APIResourceDiscovery) (metav1.APIResourc
 		Categories:   in.Categories,
 	}
 	var err error
-	if in.ResponseKind != nil && (*in.ResponseKind) != emptyKind {
+	if in.ResponseKind != nil {
 		result.Group = in.ResponseKind.Group
 		result.Version = in.ResponseKind.Version
 		result.Kind = in.ResponseKind.Kind
@@ -142,7 +140,7 @@ func convertAPIResource(in apidiscovery.APIResourceDiscovery) (metav1.APIResourc
 // convertAPISubresource tranforms a APISubresourceDiscovery to an APIResource.
 func convertAPISubresource(parent metav1.APIResource, in apidiscovery.APISubresourceDiscovery) (metav1.APIResource, error) {
 	result := metav1.APIResource{}
-	if in.ResponseKind == nil || (*in.ResponseKind) == emptyKind {
+	if in.ResponseKind == nil {
 		return result, fmt.Errorf("subresource %s/%s missing GVK", parent.Name, in.Subresource)
 	}
 	result.Name = fmt.Sprintf("%s/%s", parent.Name, in.Subresource)

discovery/aggregated_discovery_test.go

@@ -610,76 +610,6 @@ func TestSplitGroupsAndResources(t *testing.T) {
 			},
 			expectedFailedGVs: map[schema.GroupVersion]error{},
 		},
-		{
-			name: "Aggregated discovery with single subresource and parent empty GVK",
-			agg: apidiscovery.APIGroupDiscoveryList{
-				Items: []apidiscovery.APIGroupDiscovery{
-					{
-						ObjectMeta: metav1.ObjectMeta{
-							Name: "external.metrics.k8s.io",
-						},
-						Versions: []apidiscovery.APIVersionDiscovery{
-							{
-								Version: "v1beta1",
-								Resources: []apidiscovery.APIResourceDiscovery{
-									{
-										// resilient to empty GVK for parent
-										Resource:         "*",
-										Scope:            apidiscovery.ScopeNamespace,
-										SingularResource: "",
-										ResponseKind:     &metav1.GroupVersionKind{},
-										Subresources: []apidiscovery.APISubresourceDiscovery{
-											{
-												Subresource: "other-external-metric",
-												ResponseKind: &metav1.GroupVersionKind{
-													Kind: "MetricValueList",
-												},
-												Verbs: []string{"get"},
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			expectedGroups: metav1.APIGroupList{
-				Groups: []metav1.APIGroup{
-					{
-						Name: "external.metrics.k8s.io",
-						Versions: []metav1.GroupVersionForDiscovery{
-							{
-								GroupVersion: "external.metrics.k8s.io/v1beta1",
-								Version:      "v1beta1",
-							},
-						},
-						PreferredVersion: metav1.GroupVersionForDiscovery{
-							GroupVersion: "external.metrics.k8s.io/v1beta1",
-							Version:      "v1beta1",
-						},
-					},
-				},
-			},
-			expectedGVResources: map[schema.GroupVersion]*metav1.APIResourceList{
-				{Group: "external.metrics.k8s.io", Version: "v1beta1"}: {
-					GroupVersion: "external.metrics.k8s.io/v1beta1",
-					APIResources: []metav1.APIResource{
-						// Since parent GVK was nil, it is NOT returned--only the subresource.
-						{
-							Name:         "*/other-external-metric",
-							SingularName: "",
-							Namespaced:   true,
-							Group:        "",
-							Version:      "",
-							Kind:         "MetricValueList",
-							Verbs:        []string{"get"},
-						},
-					},
-				},
-			},
-			expectedFailedGVs: map[schema.GroupVersion]error{},
-		},
 		{
 			name: "Aggregated discovery with multiple subresources",
 			agg: apidiscovery.APIGroupDiscoveryList{

go.mod

@@ -24,8 +24,8 @@ require (
 	golang.org/x/term v0.6.0
 	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
 	google.golang.org/protobuf v1.28.1
-	k8s.io/api v0.27.5
-	k8s.io/apimachinery v0.27.5
+	k8s.io/api v0.27.4
+	k8s.io/apimachinery v0.27.4
 	k8s.io/klog/v2 v2.90.1
 	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
 	k8s.io/utils v0.0.0-20230209194617-a36077c30491
@@ -59,6 +59,6 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.27.5
-	k8s.io/apimachinery => k8s.io/apimachinery v0.27.5
+	k8s.io/api => k8s.io/api v0.27.4
+	k8s.io/apimachinery => k8s.io/apimachinery v0.27.4
 )

go.sum

@@ -477,10 +477,10 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.27.5 h1:49hIzqJNSuOQpA53MMihgAS4YDcQitTy58B9PMFthLc=
-k8s.io/api v0.27.5/go.mod h1:zjBZB+c0KDU55Wxb9Bob9WZGxu9zdKHitzHxBtaIVoA=
-k8s.io/apimachinery v0.27.5 h1:6Q5HBXYJJPisd6yDVAprLe6FQsmw7a7Cu69dcrpQET8=
-k8s.io/apimachinery v0.27.5/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
+k8s.io/api v0.27.4 h1:0pCo/AN9hONazBKlNUdhQymmnfLRbSZjd5H5H3f0bSs=
+k8s.io/api v0.27.4/go.mod h1:O3smaaX15NfxjzILfiln1D8Z3+gEYpjEpiNA/1EVK1Y=
+k8s.io/apimachinery v0.27.4 h1:CdxflD4AF61yewuid0fLl6bM4a3q04jWel0IlP+aYjs=
+k8s.io/apimachinery v0.27.4/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
 k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
 k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=

util/cert/cert.go

@@ -45,7 +45,6 @@ type Config struct {
 	Organization []string
 	AltNames     AltNames
 	Usages       []x509.ExtKeyUsage
-	NotBefore    time.Time
 }
 
 // AltNames contains the domain names and IP addresses that will be added
@@ -65,10 +64,6 @@ func NewSelfSignedCACert(cfg Config, key crypto.Signer) (*x509.Certificate, erro
 		return nil, err
 	}
 	serial = new(big.Int).Add(serial, big.NewInt(1))
-	notBefore := now.UTC()
-	if !cfg.NotBefore.IsZero() {
-		notBefore = cfg.NotBefore.UTC()
-	}
 	tmpl := x509.Certificate{
 		SerialNumber: serial,
 		Subject: pkix.Name{
@@ -76,7 +71,7 @@ func NewSelfSignedCACert(cfg Config, key crypto.Signer) (*x509.Certificate, erro
 			Organization: cfg.Organization,
 		},
 		DNSNames:              []string{cfg.CommonName},
-		NotBefore:             notBefore,
+		NotBefore:             now.UTC(),
 		NotAfter:              now.Add(duration365d * 10).UTC(),
 		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
 		BasicConstraintsValid: true,