[INFRA-2155] Removing aladdin dns-sync (#162)

* [INFRA-2155] Removing aladdin dns-sync * [INFRA-2155] Updating aladdin version * [INFRA-2155] Removing function to create HZ * [INFRA-2155] Bringing back functionality to create HZ * [INFRA-2155] Removing function to create HZ * [INFRA-2155] Bringing back functionality to create HZ * [INFRA-2479] Removing from container values
fivestars-os · Dec 6, 2023 · d31cda4 · d31cda4
1 parent 0f56f86
commit d31cda4
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 82 deletions.
diff --git a/aladdin/bash/container/cluster/cluster b/aladdin/bash/container/cluster/cluster
@@ -141,7 +141,7 @@ function populate {
     # This script pulls from your backup folder in your $CLUSTER_CODE directory in your config directory
     # It reads the namespaces.txt file and creates all those namepsaces, and then populates those
     # namespaces with each namespace's yaml files to create all the k8s resources.
-    # We then call sync-ingress and sync-dns to update the route 53 records and ingress resource if necessary.
+    # We then call sync-ingress to update ingress resource if necessary.
 
     if ! "$SKIP_PROMPTS"; then
         echo "Is the cluster you wish to populate $CLUSTER_CODE? [y/N] "
@@ -171,7 +171,6 @@ function populate {
     for ns in $(cat "$path_to_resources/namespaces.txt")
     do
         $PY_MAIN sync-ingress --namespace "$ns"
-        $PY_MAIN sync-dns --namespace "$ns"
     done
 }
 

diff --git a/aladdin/bash/container/test-remote/test-deploy.bats b/aladdin/bash/container/test-remote/test-deploy.bats
@@ -18,8 +18,6 @@ load test_helper
     kubectl get hpa | grep "aladdin-test-hpa\s"
     # Let elb become ready by sleeping for a minute
     sleep 60
-    # Sync the dns after this in case it wasn't immediately ready
-    $PY_MAIN sync-dns
     # Verify sync-dns by checking if cname value equals service elb
     service_elb=$(get_elb aladdin-test-server)
     [[ $service_elb == $(get_cname_value aladdin-test-server "default.$DNS_ZONE") ]]

diff --git a/aladdin/commands/deploy.py b/aladdin/commands/deploy.py
@@ -8,7 +8,7 @@
     COMMON_OPTION_PARSER, HELM_OPTION_PARSER, CHART_OPTION_PARSER, container_command
 )
 from aladdin.lib.cluster_rules import ClusterRules
-from aladdin.commands import sync_ingress, sync_dns
+from aladdin.commands import sync_ingress
 from aladdin.config import load_git_configs
 from aladdin.lib.helm_rules import HelmRules
 from aladdin.lib.git import Git
@@ -111,4 +111,3 @@ def deploy(
         )
         if not dry_run:
             sync_ingress.sync_ingress(namespace)
-            sync_dns.sync_dns(namespace)
diff --git a/aladdin/commands/rollback.py b/aladdin/commands/rollback.py
@@ -1,5 +1,5 @@
 from aladdin.lib.arg_tools import add_namespace_argument, container_command
-from aladdin.commands import sync_ingress, sync_dns
+from aladdin.commands import sync_ingress
 from aladdin.lib.helm_rules import HelmRules
 from aladdin.lib.k8s.helm import Helm
 
@@ -28,4 +28,3 @@ def rollback(project, num_versions, namespace, chart=None):
     helm.rollback_relative(HelmRules.get_release_name(chart or project), num_versions, namespace)
 
     sync_ingress.sync_ingress(namespace)
-    sync_dns.sync_dns(namespace)
diff --git a/aladdin/commands/start.py b/aladdin/commands/start.py
@@ -5,7 +5,7 @@
     COMMON_OPTION_PARSER, HELM_OPTION_PARSER, CHARTS_OPTION_PARSER, container_command
 )
 from aladdin.lib.cluster_rules import ClusterRules
-from aladdin.commands import sync_ingress, sync_dns
+from aladdin.commands import sync_ingress
 from aladdin.lib.helm_rules import HelmRules
 from aladdin.lib.k8s.helm import Helm
 from aladdin.lib.project_conf import ProjectConf
@@ -76,4 +76,3 @@ def start(
         # Sync if any helm.start() call succeeded, even if a subsequent one failed
         if not dry_run:
             sync_ingress.sync_ingress(namespace)
-            sync_dns.sync_dns(namespace)
diff --git a/aladdin/commands/stop.py b/aladdin/commands/stop.py
@@ -3,7 +3,7 @@
 
 from aladdin.lib.arg_tools import CHARTS_OPTION_PARSER, COMMON_OPTION_PARSER, container_command
 from aladdin.lib.cluster_rules import ClusterRules
-from aladdin.commands import sync_ingress, sync_dns
+from aladdin.commands import sync_ingress
 from aladdin.lib.helm_rules import HelmRules
 from aladdin.lib.k8s.helm import Helm
 from aladdin.lib.project_conf import ProjectConf
@@ -43,4 +43,3 @@ def stop(namespace, charts):
         # Sync if any helm.stop() call succeeded, even if a subsequent one failed
         if sync_required:
             sync_ingress.sync_ingress(namespace)
-            sync_dns.sync_dns(namespace)
diff --git a/aladdin/commands/sync_dns.py b/aladdin/commands/sync_dns.py
diff --git a/aladdin/commands/undeploy.py b/aladdin/commands/undeploy.py
@@ -1,6 +1,6 @@
 from aladdin.lib.arg_tools import add_namespace_argument, container_command
 from aladdin.lib.cluster_rules import ClusterRules
-from aladdin.commands import sync_ingress, sync_dns
+from aladdin.commands import sync_ingress
 from aladdin.lib.helm_rules import HelmRules
 from aladdin.lib.k8s.helm import Helm
 
@@ -30,4 +30,3 @@ def undeploy(project, namespace, chart=None):
     helm.stop(HelmRules.get_release_name(chart or project), namespace)
 
     sync_ingress.sync_ingress(namespace)
-    sync_dns.sync_dns(namespace)
diff --git a/aladdin/main.py b/aladdin/main.py
@@ -25,7 +25,6 @@
     scale,
     start,
     stop,
-    sync_dns,
     sync_ingress,
     tail,
     undeploy,
@@ -62,7 +61,6 @@ def cli():
         scale,
         start,
         stop,
-        sync_dns,
         sync_ingress,
         tail,
         undeploy,

diff --git a/docs/sync_dns_cmd.md b/docs/sync_dns_cmd.md
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aladdin"
-version = "1.25.15.1"
+version = "1.25.15.2"
 description = ""
 authors = ["Fivestars <dev@fivestars.com>"]
 include = [