From 74929e6c02383c88ca4660623a7f6e9d6bb760ec Mon Sep 17 00:00:00 2001 From: Maartje Eyskens Date: Thu, 27 Aug 2020 11:02:50 +0200 Subject: [PATCH] revert scheme changes Signed-off-by: Maartje Eyskens --- pkg/ctl/scheme.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkg/ctl/scheme.go b/pkg/ctl/scheme.go index 4b88c6fb8..4bc958ece 100644 --- a/pkg/ctl/scheme.go +++ b/pkg/ctl/scheme.go @@ -1,12 +1,9 @@ /* Copyright 2020 The Jetstack cert-manager contributors. - Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,6 +21,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" + kscheme "k8s.io/client-go/kubernetes/scheme" acmeinstall "github.com/jetstack/cert-manager/pkg/internal/apis/acme/install" cminstall "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/install" @@ -46,9 +45,9 @@ func init() { metainstall.Install(Scheme) // This is used to add the List object type - listGroupVersion := schema.GroupVersionKind{Group: "", Version: runtime.APIVersionInternal} + listGroupVersion := schema.GroupVersionKind{Group: "", Version: runtime.APIVersionInternal, Kind: "List"} Scheme.AddKnownTypeWithName(listGroupVersion, &metainternalversion.List{}) - coreGroupVersion := schema.GroupVersion{Group: "", Version: "v1"} - Scheme.AddKnownTypes(coreGroupVersion, &metav1.List{}) + metav1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + utilruntime.Must(kscheme.AddToScheme(Scheme)) }