Skip to content

Commit 2be6a7f

Browse files
author
shaowei su
committed
add service validation
1 parent 9976f7a commit 2be6a7f

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

pkg/cert-generator/v1beta1/generate/generate.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ func NewGenerateCmd(kubeClient client.Client) *cobra.Command {
6868

6969
// run is main function for `generate` subcommand.
7070
func (o *generateOptions) run(ctx context.Context, kubeClient client.Client) error {
71+
controllerService := &corev1.Service{}
72+
if err := kubeClient.Get(ctx, client.ObjectKey{Namespace: o.namespace, Name: o.serviceName}, controllerService); err != nil {
73+
klog.Errorf("Unable to locate controller service: %s", o.serviceName)
74+
return err
75+
}
76+
7177
o.fullServiceDomain = strings.Join([]string{o.serviceName, o.namespace, "svc"}, ".")
7278

7379
caKeyPair, err := o.createCACert()

pkg/cert-generator/v1beta1/generate/generate_test.go

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ func TestGenerate(t *testing.T) {
8585
},
8686
},
8787
}
88-
8988
oldWebhookCertSecret := &corev1.Secret{
9089
TypeMeta: metav1.TypeMeta{
9190
Kind: "Secret",
@@ -96,6 +95,16 @@ func TestGenerate(t *testing.T) {
9695
Namespace: testNamespace,
9796
},
9897
}
98+
testControllerService := &corev1.Service{
99+
TypeMeta: metav1.TypeMeta{
100+
Kind: "Service",
101+
APIVersion: "v1",
102+
},
103+
ObjectMeta: metav1.ObjectMeta{
104+
Name: consts.Service,
105+
Namespace: testNamespace,
106+
},
107+
}
99108

100109
tests := []struct {
101110
testDescription string
@@ -109,6 +118,7 @@ func TestGenerate(t *testing.T) {
109118
testGeneratorJob,
110119
testValidatingWebhook,
111120
testMutatingWebhook,
121+
testControllerService,
112122
},
113123
},
114124
{
@@ -119,6 +129,7 @@ func TestGenerate(t *testing.T) {
119129
testValidatingWebhook,
120130
testMutatingWebhook,
121131
oldWebhookCertSecret,
132+
testControllerService,
122133
},
123134
},
124135
{
@@ -127,6 +138,7 @@ func TestGenerate(t *testing.T) {
127138
objects: []client.Object{
128139
testValidatingWebhook,
129140
testMutatingWebhook,
141+
testControllerService,
130142
},
131143
},
132144
{
@@ -135,6 +147,7 @@ func TestGenerate(t *testing.T) {
135147
objects: []client.Object{
136148
testGeneratorJob,
137149
testMutatingWebhook,
150+
testControllerService,
138151
},
139152
},
140153
{
@@ -143,6 +156,15 @@ func TestGenerate(t *testing.T) {
143156
objects: []client.Object{
144157
testGeneratorJob,
145158
testValidatingWebhook,
159+
testControllerService,
160+
},
161+
},
162+
{
163+
testDescription: "There is no Service katib-controller",
164+
err: true,
165+
objects: []client.Object{
166+
testGeneratorJob,
167+
testMutatingWebhook,
146168
},
147169
},
148170
}

0 commit comments

Comments
 (0)