@@ -23,19 +23,19 @@ appChartName = "b2b-dm-staging"
2323infraChartName = "b2b-infra-dm-staging"
2424namespace = "staging"
2525
26−releaseName chartName name = chartName ++ "-" ++ namespace ++ "-" ++ name
26+releaseName chartName name = chartName ++ "-" ++ name
2727
2828createAppArgs name tag envs = [
2929 "-d", "deploy"
3030 , "--release-name", releaseName appChartName name
31− , "--set", "'b2b-app.email_domain=" ++ name ++ ".kube.thebestagent.pro'"
32− , "--set", "'b2b-app.domain=" ++ name ++ ".kube.thebestagent.pro'"
33− , "--set", "'b2b-app.connections.pg_instance=avia:avia@" ++ rn ++ "-postgres-0." ++ rn ++ "-postgres." ++ namespace ++ ":5432'"
34− , "--set", "'b2b-app.connections.elastic=http://" ++ rn ++ "-elasticsearch." ++ namespace ++ ":9200'"
35− , "--set", "'b2b-app.connections.elasic_hosts=http://" ++ rn ++ "-elasticsearch-0." ++ rn ++ "-elasticsearch." ++ namespace ++ ":9200'"
36− , "--set", "'b2b-app.connections.redis=" ++ rn ++ "-redis-0." ++ rn ++ "-redis." ++ namespace ++ ":6379'"
37− , "--set", "'b2b-app.connections.kafka_ext=" ++ rn ++ "-kafka-int-0." ++ rn ++ "-kafka-int:9092'"
38− , "--set", "'b2b-app.connections.kafka_int=" ++ rn ++ "-kafka-int-0." ++ rn ++ "-kafka-int:9092'"
31+ , "--set", "b2b-app.email_domain=" ++ name ++ ".kube.thebestagent.pro"
32+ , "--set", "b2b-app.domain=" ++ name ++ ".kube.thebestagent.pro"
33+ , "--set", "b2b-app.connections.pg_instance=avia:avia@" ++ rn ++ "-postgres-0." ++ rn ++ "-postgres." ++ namespace ++ ":5432"
34+ , "--set", "b2b-app.connections.elastic=http://" ++ rn ++ "-elasticsearch." ++ namespace ++ ":9200"
35+ , "--set", "b2b-app.connections.elasic_hosts=http://" ++ rn ++ "-elasticsearch-0." ++ rn ++ "-elasticsearch." ++ namespace ++ ":9200"
36+ , "--set", "b2b-app.connections.redis=" ++ rn ++ "-redis-0." ++ rn ++ "-redis." ++ namespace ++ ":6379"
37+ , "--set", "b2b-app.connections.kafka_ext=" ++ rn ++ "-kafka-int-0." ++ rn ++ "-kafka-int:9092"
38+ , "--set", "b2b-app.connections.kafka_int=" ++ rn ++ "-kafka-int-0." ++ rn ++ "-kafka-int:9092"
3939 ]
4040 ++ mconcat (fmap ((\a b -> [a, b]) "--set") envs)
4141 ++ [
@@ -46,18 +46,18 @@ createAppArgs name tag envs = [
4646createInfraArgs name = [
4747 "-d", "deploy"
4848 , "--release-name", rn
49− , "--set", "'b2b-kafka-int.zk=" ++ rn ++ "-zk-0." ++ rn ++ "-zk." ++ namespace ++ "/int'"
50− , "--set", "'b2b-elasticsearch.cluster_hosts=" ++ rn ++ "-elasticsearch-0." ++ rn ++ "-elasticsearch." ++ namespace ++ "'"
51− , "--set", "'b2b-postgres.postgres_db=" ++ rn_ ++ "'"
49+ , "--set", "b2b-kafka-int.zk=" ++ rn ++ "-zk-0." ++ rn ++ "-zk." ++ namespace ++ "/int"
50+ , "--set", "b2b-elasticsearch.cluster_hosts=" ++ rn ++ "-elasticsearch-0." ++ rn ++ "-elasticsearch." ++ namespace
51+ , "--set", "b2b-postgres.postgres_db=" ++ db
5252 , infraChartName
5353 ]
5454 where rn = releaseName infraChartName name
55− rn_ = fmap (\c -> if c == '-' then '_' else c) rn
55+ db = (\c -> if c == '-' then '_' else c) <$> releaseName appChartName name
5656
5757editAppArgs = createAppArgs
5858
5959updateAppArgs = createAppArgs
6060
61−destroyAppArgs name = [releaseName appChartName name, "--purge"]
61+destroyAppArgs name = ["delete", releaseName appChartName name, "--purge"]
6262
63−destroyInfraArgs name = [releaseName infraChartName name, "--purge"]
63+destroyInfraArgs name = ["delete", releaseName infraChartName name, "--purge"]