Skip to content

Commit 5d024ca

Browse files
authored
Merge pull request #154 from fanminshi/fix_style_in_example_handler
*: use appsv1 instead of apps_v1
2 parents f9ffd1b + 981ed26 commit 5d024ca

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ import (
172172
"github.com/coreos/operator-sdk/pkg/sdk/handler"
173173
"github.com/coreos/operator-sdk/pkg/sdk/types"
174174
"github.com/sirupsen/logrus"
175-
apps_v1 "k8s.io/api/apps/v1"
175+
appsv1 "k8s.io/api/apps/v1"
176176
"k8s.io/api/core/v1"
177177
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
178178
)
@@ -187,7 +187,7 @@ func (h *Handler) Handle(ctx types.Context, event types.Event) []types.Action {
187187
"name": obj.Name,
188188
}
189189
ns := "default"
190-
d := &apps_v1.Deployment{
190+
d := &appsv1.Deployment{
191191
TypeMeta: metav1.TypeMeta{
192192
APIVersion: "apps/v1",
193193
Kind: "Deployment",
@@ -196,7 +196,7 @@ func (h *Handler) Handle(ctx types.Context, event types.Event) []types.Action {
196196
Name: obj.Name,
197197
Namespace: ns,
198198
},
199-
Spec: apps_v1.DeploymentSpec{
199+
Spec: appsv1.DeploymentSpec{
200200
Selector: &metav1.LabelSelector{
201201
MatchLabels: ls,
202202
},

example/memcached-operator/handler.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/coreos/operator-sdk/pkg/sdk/handler"
1111
"github.com/coreos/operator-sdk/pkg/sdk/query"
1212
"github.com/coreos/operator-sdk/pkg/sdk/types"
13-
apps_v1 "k8s.io/api/apps/v1"
13+
appsv1 "k8s.io/api/apps/v1"
1414
"k8s.io/api/core/v1"
1515
apierrors "k8s.io/apimachinery/pkg/api/errors"
1616
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -71,11 +71,11 @@ func (h *Handler) Handle(ctx types.Context, event types.Event) error {
7171
}
7272

7373
// deploymentForMemcached returns a memcached Deployment object
74-
func deploymentForMemcached(m *v1alpha1.Memcached) *apps_v1.Deployment {
74+
func deploymentForMemcached(m *v1alpha1.Memcached) *appsv1.Deployment {
7575
ls := labelsForMemcached(m.Name)
7676
replicas := m.Spec.Size
7777

78-
dep := &apps_v1.Deployment{
78+
dep := &appsv1.Deployment{
7979
TypeMeta: metav1.TypeMeta{
8080
APIVersion: "apps/v1",
8181
Kind: "Deployment",
@@ -84,7 +84,7 @@ func deploymentForMemcached(m *v1alpha1.Memcached) *apps_v1.Deployment {
8484
Name: m.Name,
8585
Namespace: m.Namespace,
8686
},
87-
Spec: apps_v1.DeploymentSpec{
87+
Spec: appsv1.DeploymentSpec{
8888
Replicas: &replicas,
8989
Selector: &metav1.LabelSelector{
9090
MatchLabels: ls,

0 commit comments

Comments
 (0)