Change api version to v1alpha1

pull/2160/head
tamal 9 years ago
parent 705aa009bb
commit 4cdf63f10c

@ -1,7 +1,7 @@
metadata: metadata:
name: release.helm.sh name: release.helm.sh
apiVersion: extensions/v1beta1 apiVersion: extensions/v1alpha1
kind: ThirdPartyResource kind: ThirdPartyResource
description: "A specification of Helm release" description: "A specification of Helm release"
versions: versions:
- name: v1beta1 - name: v1alpha1

@ -10,13 +10,13 @@ func init() {
if err := announced.NewGroupMetaFactory( if err := announced.NewGroupMetaFactory(
&announced.GroupMetaFactoryArgs{ &announced.GroupMetaFactoryArgs{
GroupName: aci.GroupName, GroupName: aci.GroupName,
VersionPreferenceOrder: []string{aci.V1beta1SchemeGroupVersion.Version}, VersionPreferenceOrder: []string{aci.V1alpha1SchemeGroupVersion.Version},
ImportPrefix: "k8s.io/helm/api", ImportPrefix: "k8s.io/helm/api",
RootScopedKinds: sets.NewString("ThirdPartyResource"), RootScopedKinds: sets.NewString("ThirdPartyResource"),
AddInternalObjectsToScheme: aci.AddToScheme, AddInternalObjectsToScheme: aci.AddToScheme,
}, },
announced.VersionToSchemeFunc{ announced.VersionToSchemeFunc{
aci.V1beta1SchemeGroupVersion.Version: aci.V1betaAddToScheme, aci.V1alpha1SchemeGroupVersion.Version: aci.V1betaAddToScheme,
}, },
).Announce().RegisterAndEnable(); err != nil { ).Announce().RegisterAndEnable(); err != nil {
panic(err) panic(err)

@ -8,22 +8,22 @@ import (
) )
// SchemeGroupVersion is group version used to register these objects // 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 ( var (
V1beta1SchemeBuilder = runtime.NewSchemeBuilder(v1addKnownTypes) V1alpha1SchemeBuilder = runtime.NewSchemeBuilder(v1addKnownTypes)
V1betaAddToScheme = V1beta1SchemeBuilder.AddToScheme V1betaAddToScheme = V1alpha1SchemeBuilder.AddToScheme
) )
// Adds the list of known types to api.Scheme. // Adds the list of known types to api.Scheme.
func v1addKnownTypes(scheme *runtime.Scheme) error { func v1addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(V1beta1SchemeGroupVersion, scheme.AddKnownTypes(V1alpha1SchemeGroupVersion,
&Release{}, &Release{},
&ReleaseList{}, &ReleaseList{},
&v1.ListOptions{}, &v1.ListOptions{},
&v1.DeleteOptions{}, &v1.DeleteOptions{},
) )
versionedwatch.AddToGroupVersion(scheme, V1beta1SchemeGroupVersion) versionedwatch.AddToGroupVersion(scheme, V1alpha1SchemeGroupVersion)
return nil return nil
} }

@ -145,8 +145,8 @@ func (c *extendedCodec) EncodeParameters(obj runtime.Object, to schema.GroupVers
func setDefaultVersionKind(obj runtime.Object) { func setDefaultVersionKind(obj runtime.Object) {
// Check the values can are In type Extended Ingress // Check the values can are In type Extended Ingress
defaultGVK := schema.GroupVersionKind{ defaultGVK := schema.GroupVersionKind{
Group: aci.V1beta1SchemeGroupVersion.Group, Group: aci.V1alpha1SchemeGroupVersion.Group,
Version: aci.V1beta1SchemeGroupVersion.Version, Version: aci.V1alpha1SchemeGroupVersion.Version,
} }
fullyQualifiedKind := reflect.ValueOf(obj).Type().String() fullyQualifiedKind := reflect.ValueOf(obj).Type().String()

@ -56,19 +56,19 @@ func NewExtensionsForConfigOrDie(c *rest.Config) *ExtensionsClient {
return client 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 { func NewNewExtensions(c rest.Interface) *ExtensionsClient {
return &ExtensionsClient{c} return &ExtensionsClient{c}
} }
func setExtensionsDefaults(config *rest.Config) error { func setExtensionsDefaults(config *rest.Config) error {
gv, err := schema.ParseGroupVersion("helm.sh/v1beta1") gv, err := schema.ParseGroupVersion("helm.sh/v1alpha1")
if err != nil { if err != nil {
return err 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) { 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 config.APIPath = defaultAPIPath
if config.UserAgent == "" { if config.UserAgent == "" {

@ -14,7 +14,7 @@ type FakeRelease struct {
ns string 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. // Get returns the Release by name.
func (mock *FakeRelease) Get(name string) (*aci.Release, error) { func (mock *FakeRelease) Get(name string) (*aci.Release, error) {

@ -291,19 +291,19 @@ func namespace() string {
} }
func ensureResource(clientset *internalclientset.Clientset) { 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) { if kberrs.IsNotFound(err) {
tpr := &extensions.ThirdPartyResource{ tpr := &extensions.ThirdPartyResource{
TypeMeta: unversioned.TypeMeta{ TypeMeta: unversioned.TypeMeta{
APIVersion: "extensions/v1beta1", APIVersion: "extensions/v1alpha1",
Kind: "ThirdPartyResource", Kind: "ThirdPartyResource",
}, },
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Name: "release." + rapi.V1beta1SchemeGroupVersion.Group, Name: "release." + rapi.V1alpha1SchemeGroupVersion.Group,
}, },
Versions: []extensions.APIVersion{ Versions: []extensions.APIVersion{
{ {
Name: rapi.V1beta1SchemeGroupVersion.Version, Name: rapi.V1alpha1SchemeGroupVersion.Version,
}, },
}, },
} }

Loading…
Cancel
Save