Prechádzať zdrojové kódy

check labels not annotations

Alexander Belanger 5 rokov pred
rodič
commit
cd33884672
1 zmenil súbory, kde vykonal 1 pridanie a 5 odobranie
  1. 1 5
      internal/kubernetes/domain/domain.go

+ 1 - 5
internal/kubernetes/domain/domain.go

@@ -30,12 +30,8 @@ func GetNGINXIngressServiceIP(clientset kubernetes.Interface) (string, bool, err
 	exists := false
 	exists := false
 
 
 	for _, svc := range svcList.Items {
 	for _, svc := range svcList.Items {
-		fmt.Println("CHECKING SVC", svc.ObjectMeta.Name)
-
 		// check that helm chart annotation is correct exists
 		// check that helm chart annotation is correct exists
-		if chartAnn, found := svc.ObjectMeta.Annotations["helm.sh/chart"]; found {
-			fmt.Println("FOUND CHART ANNOTATION", chartAnn)
-
+		if chartAnn, found := svc.ObjectMeta.Labels["helm.sh/chart"]; found {
 			if (strings.Contains(chartAnn, "ingress-nginx") || strings.Contains(chartAnn, "nginx-ingress")) && svc.Spec.Type == v1.ServiceTypeLoadBalancer {
 			if (strings.Contains(chartAnn, "ingress-nginx") || strings.Contains(chartAnn, "nginx-ingress")) && svc.Spec.Type == v1.ServiceTypeLoadBalancer {
 				nginxSvc = &svc
 				nginxSvc = &svc
 				exists = true
 				exists = true