github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

add import-alias for k8s.io/api/settings/v1alpha1

Browse Source
This commit is contained in:
Aaron Crickenberger 2019-06-20 11:40:54 -07:00
parent 73287fa721
commit 35cef7369e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/.import-aliases
View File

@ -29,5 +29,6 @@
"k8s.io/api/rbac/v1beta1": "rbacv1beta1", "k8s.io/api/rbac/v1beta1": "rbacv1beta1",
"k8s.io/api/scheduling/v1": "schedulingv1", "k8s.io/api/scheduling/v1": "schedulingv1",
"k8s.io/api/scheduling/v1alpha1": "schedulingv1alpha1", "k8s.io/api/scheduling/v1alpha1": "schedulingv1alpha1",
"k8s.io/api/scheduling/v1beta1": "schedulingv1beta1" "k8s.io/api/scheduling/v1beta1": "schedulingv1beta1",
"k8s.io/api/settings/v1alpha1": "settingsv1alpha1"
} }

12
test/e2e/servicecatalog/podpreset.go
View File

@ -22,7 +22,7 @@ import (
"time" "time"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
settings "k8s.io/api/settings/v1alpha1" settingsv1alpha1 "k8s.io/api/settings/v1alpha1"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
@ -50,12 +50,12 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() {
ginkgo.It("should create a pod preset", func() { ginkgo.It("should create a pod preset", func() {
ginkgo.By("Creating a pod preset") ginkgo.By("Creating a pod preset")
pip := &settings.PodPreset{ pip := &settingsv1alpha1.PodPreset{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "hello", Name: "hello",
Namespace: f.Namespace.Name, Namespace: f.Namespace.Name,
}, },
Spec: settings.PodPresetSpec{ Spec: settingsv1alpha1.PodPresetSpec{
Selector: metav1.LabelSelector{ Selector: metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{ MatchExpressions: []metav1.LabelSelectorRequirement{
{ {
@ -168,12 +168,12 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() {
ginkgo.It("should not modify the pod on conflict", func() { ginkgo.It("should not modify the pod on conflict", func() {
ginkgo.By("Creating a pod preset") ginkgo.By("Creating a pod preset")
pip := &settings.PodPreset{ pip := &settingsv1alpha1.PodPreset{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "hello", Name: "hello",
Namespace: f.Namespace.Name, Namespace: f.Namespace.Name,
}, },
Spec: settings.PodPresetSpec{ Spec: settingsv1alpha1.PodPresetSpec{
Selector: metav1.LabelSelector{ Selector: metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{ MatchExpressions: []metav1.LabelSelectorRequirement{
{ {
@ -287,6 +287,6 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() {
}) })
}) })
func createPodPreset(c clientset.Interface, ns string, job *settings.PodPreset) (*settings.PodPreset, error) { func createPodPreset(c clientset.Interface, ns string, job *settingsv1alpha1.PodPreset) (*settingsv1alpha1.PodPreset, error) {
return c.SettingsV1alpha1().PodPresets(ns).Create(job) return c.SettingsV1alpha1().PodPresets(ns).Create(job)
} }