fix createIngress conditions

chatwork · Nov 24, 2023 · 86cec22 · 86cec22
1 parent e030d1b
commit 86cec22
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmd/ingress/ingressCheck.go b/cmd/ingress/ingressCheck.go
@@ -134,7 +134,7 @@ func (i *Ingress) createResources() error {
 		i.Chatwork.AddMessage(fmt.Sprintf("Error Create Service: %s", err))
 		return err
 	}
-	if err := k.CreateIngress(i.createIngressObject(), i.NoDnsCheck); err != nil {
+	if err := k.CreateIngress(i.createIngressObject()); err != nil {
 		i.Chatwork.AddMessage(fmt.Sprintf("Error Create Ingress: %s", err))
 		return err
 	}

diff --git a/util/k8s/resources.go b/util/k8s/resources.go
@@ -151,7 +151,7 @@ func (k *K8s) DeleteService(serviceName string) error {
 	return nil
 }
 
-func (k *K8s) CreateIngress(ingress *networkingv1.Ingress, NoAddressCheck bool) error {
+func (k *K8s) CreateIngress(ingress *networkingv1.Ingress) error {
 	ingressClient := k.clientset.NetworkingV1().Ingresses(k.namespace)
 
 	k.logger().Infof("Creating ingress: %s", ingress.Name)
@@ -168,7 +168,7 @@ func (k *K8s) CreateIngress(ingress *networkingv1.Ingress, NoAddressCheck bool)
 		return err
 	}
 
-	if !NoAddressCheck {
+	if *ingress.Spec.IngressClassName == "alb" {
 		err = wait.PollUntilContextTimeout(context.Background(), 5*time.Second, 5*time.Minute, false, func(ctx context.Context) (bool, error) {
 			ingress, err := ingressClient.Get(ctx, ingress.Name, metav1.GetOptions{})
 			if err != nil {