Skip to content

Commit

Permalink
incorporate review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
patilpankaj212 committed May 17, 2021
1 parent 9b7055d commit ed1d44a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ e2e-tests: build
./scripts/run-e2e.sh

# run e2e validating webhook
e2e-validating-webhook: build
./scripts/e2e-validating-webhook.sh
e2e-admission-control-tests: build
./scripts/e2e-admission-control.sh

# install kind
install-kind:
Expand Down
File renamed without changes.
8 changes: 2 additions & 6 deletions test/e2e/validatingwebhook/kubeclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ func NewKubernetesClient() (*KubernetesClient, error) {
func (k *KubernetesClient) getK8sClient() (*kubernetes.Clientset, error) {
home, err := homedir.Dir()
if err != nil {
fmt.Println("home directory not found", err)
return nil, fmt.Errorf("home directory not found, error: %s", err.Error())
}

Expand Down Expand Up @@ -110,7 +109,6 @@ func (k *KubernetesClient) CreateValidatingWebhookConfiguration(webhookFile, cer

createdWebhookConfig, err := admr.ValidatingWebhookConfigurations().Create(context.TODO(), &webhooks, metav1.CreateOptions{})
if err != nil {
fmt.Println(err)
return nil, err
}
return createdWebhookConfig, nil
Expand All @@ -137,10 +135,9 @@ func (k *KubernetesClient) CreatePod(resourceFile string) (*v1.Pod, error) {

createdPod, err := k.client.CoreV1().Pods(namespace).Create(context.TODO(), &pod, metav1.CreateOptions{})
if err != nil {
fmt.Println(err)
return nil, err
}
return createdPod, err
return createdPod, nil
}

// DeletePod will delete the specified pod name
Expand All @@ -164,10 +161,9 @@ func (k *KubernetesClient) CreateService(resourceFile string) (*v1.Service, erro

createdService, err := k.client.CoreV1().Services(namespace).Create(context.TODO(), &service, metav1.CreateOptions{})
if err != nil {
fmt.Println(err)
return nil, err
}
return createdService, err
return createdService, nil
}

// DeleteService will delete the specified service name
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/validatingwebhook/validatingwebhook_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ func CreateCertificate(certsFolder, certFileName, privKeyFileName string) (strin
// DeleteDefaultKindCluster deletes the default kind cluster
func DeleteDefaultKindCluster() error {
cmd := exec.Command("kind", "delete", "cluster")
cmd.Stderr = os.Stderr
err := cmd.Run()
if err != nil {
return err
Expand All @@ -98,6 +99,7 @@ func DeleteDefaultKindCluster() error {
// CreateDefaultKindCluster creates the default kind cluster
func CreateDefaultKindCluster() error {
cmd := exec.Command("kind", "create", "cluster")
cmd.Stderr = os.Stderr
err := cmd.Run()
if err != nil {
return err
Expand Down

0 comments on commit ed1d44a

Please sign in to comment.