From 4cdf63f10ccdb2cb3344f78ebc1ee41f63e69fd1 Mon Sep 17 00:00:00 2001 From: tamal Date: Tue, 21 Mar 2017 15:27:02 -0700 Subject: [PATCH] Change api version to v1alpha1 --- api/extensions/helm.yaml | 4 ++-- api/install/install.go | 4 ++-- api/register_v1beta1.go | 10 +++++----- client/clientset/codec.go | 4 ++-- client/clientset/extensions.go | 8 ++++---- client/clientset/fake/release.go | 2 +- cmd/tiller/tiller.go | 8 ++++---- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/api/extensions/helm.yaml b/api/extensions/helm.yaml index 1479a2295..d9d9f7f2d 100644 --- a/api/extensions/helm.yaml +++ b/api/extensions/helm.yaml @@ -1,7 +1,7 @@ metadata: name: release.helm.sh -apiVersion: extensions/v1beta1 +apiVersion: extensions/v1alpha1 kind: ThirdPartyResource description: "A specification of Helm release" versions: - - name: v1beta1 + - name: v1alpha1 diff --git a/api/install/install.go b/api/install/install.go index e083d0c82..4673a87c6 100644 --- a/api/install/install.go +++ b/api/install/install.go @@ -10,13 +10,13 @@ func init() { if err := announced.NewGroupMetaFactory( &announced.GroupMetaFactoryArgs{ GroupName: aci.GroupName, - VersionPreferenceOrder: []string{aci.V1beta1SchemeGroupVersion.Version}, + VersionPreferenceOrder: []string{aci.V1alpha1SchemeGroupVersion.Version}, ImportPrefix: "k8s.io/helm/api", RootScopedKinds: sets.NewString("ThirdPartyResource"), AddInternalObjectsToScheme: aci.AddToScheme, }, announced.VersionToSchemeFunc{ - aci.V1beta1SchemeGroupVersion.Version: aci.V1betaAddToScheme, + aci.V1alpha1SchemeGroupVersion.Version: aci.V1betaAddToScheme, }, ).Announce().RegisterAndEnable(); err != nil { panic(err) diff --git a/api/register_v1beta1.go b/api/register_v1beta1.go index 1f5c98929..321c66d67 100644 --- a/api/register_v1beta1.go +++ b/api/register_v1beta1.go @@ -8,22 +8,22 @@ import ( ) // SchemeGroupVersion is group version used to register these objects -var V1beta1SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"} +var V1alpha1SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} var ( - V1beta1SchemeBuilder = runtime.NewSchemeBuilder(v1addKnownTypes) - V1betaAddToScheme = V1beta1SchemeBuilder.AddToScheme + V1alpha1SchemeBuilder = runtime.NewSchemeBuilder(v1addKnownTypes) + V1betaAddToScheme = V1alpha1SchemeBuilder.AddToScheme ) // Adds the list of known types to api.Scheme. func v1addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(V1beta1SchemeGroupVersion, + scheme.AddKnownTypes(V1alpha1SchemeGroupVersion, &Release{}, &ReleaseList{}, &v1.ListOptions{}, &v1.DeleteOptions{}, ) - versionedwatch.AddToGroupVersion(scheme, V1beta1SchemeGroupVersion) + versionedwatch.AddToGroupVersion(scheme, V1alpha1SchemeGroupVersion) return nil } diff --git a/client/clientset/codec.go b/client/clientset/codec.go index 989c544a4..0dd5056f6 100644 --- a/client/clientset/codec.go +++ b/client/clientset/codec.go @@ -145,8 +145,8 @@ func (c *extendedCodec) EncodeParameters(obj runtime.Object, to schema.GroupVers func setDefaultVersionKind(obj runtime.Object) { // Check the values can are In type Extended Ingress defaultGVK := schema.GroupVersionKind{ - Group: aci.V1beta1SchemeGroupVersion.Group, - Version: aci.V1beta1SchemeGroupVersion.Version, + Group: aci.V1alpha1SchemeGroupVersion.Group, + Version: aci.V1alpha1SchemeGroupVersion.Version, } fullyQualifiedKind := reflect.ValueOf(obj).Type().String() diff --git a/client/clientset/extensions.go b/client/clientset/extensions.go index 9e76ebdf9..b5cb20953 100644 --- a/client/clientset/extensions.go +++ b/client/clientset/extensions.go @@ -56,19 +56,19 @@ func NewExtensionsForConfigOrDie(c *rest.Config) *ExtensionsClient { return client } -// New creates a new ExtensionsV1beta1Client for the given RESTClient. +// New creates a new ExtensionsV1alpha1Client for the given RESTClient. func NewNewExtensions(c rest.Interface) *ExtensionsClient { return &ExtensionsClient{c} } func setExtensionsDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("helm.sh/v1beta1") + gv, err := schema.ParseGroupVersion("helm.sh/v1alpha1") if err != nil { return err } - // if helm.sh/v1beta1 is not enabled, return an error + // if helm.sh/v1alpha1 is not enabled, return an error if !registered.IsEnabledVersion(gv) { - return fmt.Errorf("helm.sh/v1beta1 is not enabled") + return fmt.Errorf("helm.sh/v1alpha1 is not enabled") } config.APIPath = defaultAPIPath if config.UserAgent == "" { diff --git a/client/clientset/fake/release.go b/client/clientset/fake/release.go index c89e8eb1d..439d11a7b 100644 --- a/client/clientset/fake/release.go +++ b/client/clientset/fake/release.go @@ -14,7 +14,7 @@ type FakeRelease struct { ns string } -var certResource = schema.GroupVersionResource{Group: "helm.sh", Version: "v1beta1", Resource: "releases"} +var certResource = schema.GroupVersionResource{Group: "helm.sh", Version: "v1alpha1", Resource: "releases"} // Get returns the Release by name. func (mock *FakeRelease) Get(name string) (*aci.Release, error) { diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go index c7d92933e..a8ab51d5c 100644 --- a/cmd/tiller/tiller.go +++ b/cmd/tiller/tiller.go @@ -291,19 +291,19 @@ func namespace() string { } func ensureResource(clientset *internalclientset.Clientset) { - _, err := clientset.Extensions().ThirdPartyResources().Get("release." + rapi.V1beta1SchemeGroupVersion.Group) + _, err := clientset.Extensions().ThirdPartyResources().Get("release." + rapi.V1alpha1SchemeGroupVersion.Group) if kberrs.IsNotFound(err) { tpr := &extensions.ThirdPartyResource{ TypeMeta: unversioned.TypeMeta{ - APIVersion: "extensions/v1beta1", + APIVersion: "extensions/v1alpha1", Kind: "ThirdPartyResource", }, ObjectMeta: api.ObjectMeta{ - Name: "release." + rapi.V1beta1SchemeGroupVersion.Group, + Name: "release." + rapi.V1alpha1SchemeGroupVersion.Group, }, Versions: []extensions.APIVersion{ { - Name: rapi.V1beta1SchemeGroupVersion.Version, + Name: rapi.V1alpha1SchemeGroupVersion.Version, }, }, }