Bintray sunset (#49)

* updating kong download links * adding ce changes * update Amazon Linux package names Co-authored-by: Daniel Hill <[email protected]>
dwp · Apr 29, 2021 · f591d3f · f591d3f
1 parent 8c651dc
commit f591d3f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/examples/hybrid_amazon_linux/main.tf b/examples/hybrid_amazon_linux/main.tf
@@ -236,7 +236,7 @@ module "create_kong_cp" {
   vpc_id                    = aws_vpc.vpc.id
   ami_id                    = data.aws_ami.amazon_linux_2.id
   ami_operating_system      = "amazon-linux"
-  ce_pkg                    = "kong-enterprise-edition-2.3.2.0.rhel7.noarch.rpm" # there is no specific CE binary on bintray
+  ce_pkg                    = "kong-2.3.2.aws.amd64.rpm"
   key_name                  = var.key_name
   region                    = var.region
   vpc_cidr_block            = aws_vpc.vpc.cidr_block
@@ -293,7 +293,7 @@ module "create_kong_dp" {
   vpc_id               = aws_vpc.vpc.id
   ami_id               = data.aws_ami.amazon_linux_2.id
   ami_operating_system = "amazon-linux"
-  ce_pkg               = "kong-enterprise-edition-2.3.2.0.rhel7.noarch.rpm" # there is no specific CE binary on bintray
+  ce_pkg               = "kong-2.3.2.aws.amd64.rpm"
   key_name             = var.key_name
   region               = var.region
   vpc_cidr_block       = aws_vpc.vpc.cidr_block

diff --git a/templates/amazon-linux/cloud-init.sh b/templates/amazon-linux/cloud-init.sh
@@ -120,8 +120,7 @@ EE_LICENSE="placeholder"
 %{ endif ~}
 if [ "$EE_LICENSE" != "placeholder" ]; then
     echo "Installing Kong EE"
-    curl -sL https://kong.bintray.com/kong-enterprise-edition-rpm/rhel/7/${ee_pkg} \
-        -u $EE_BINTRAY_USERNAME:$EE_BINTRAY_PASSWORD \
+    curl -sL https://download.konghq.com/gateway-2.x-amazonlinux-2/Packages/k/${ee_pkg} \
         -o ${ee_pkg}
     if [ ! -f ${ee_pkg} ]; then
         echo "Error: Enterprise edition download failed, aborting."
@@ -135,7 +134,7 @@ EOF
     chmod 640 /etc/kong/license.json
 else
     echo "Installing Kong CE"
-    curl -sL "https://bintray.com/kong/kong-gateway-rpm/download_file?file_path=rhel/7/${ce_pkg}" \
+    curl -sL "https://download.konghq.com/gateway-2.x-amazonlinux-2/Packages/k/${ce_pkg}" \
         -o ${ce_pkg}
     yum install -y ${ce_pkg}
 fi

diff --git a/templates/ubuntu/cloud-init.sh b/templates/ubuntu/cloud-init.sh
@@ -119,8 +119,7 @@ EE_LICENSE="placeholder"
 %{ endif ~}
 if [ "$EE_LICENSE" != "placeholder" ]; then
     echo "Installing Kong EE"
-    curl -sL https://kong.bintray.com/kong-enterprise-edition-deb/dists/${ee_pkg} \
-        -u $EE_BINTRAY_USERNAME:$EE_BINTRAY_PASSWORD \
+    curl -sL https://download.konghq.com/gateway-2.x-ubuntu-focal/pool/all/k/kong-enterprise-edition/${ee_pkg} \
         -o ${ee_pkg}
     if [ ! -f ${ee_pkg} ]; then
         echo "Error: Enterprise edition download failed, aborting."
@@ -136,7 +135,7 @@ EOF
     chmod 640 /etc/kong/license.json
 else
     echo "Installing Kong CE"
-    curl -sL "https://bintray.com/kong/kong-deb/download_file?file_path=${ce_pkg}" \
+    curl -sL "https://download.konghq.com/gateway-2.x-ubuntu-focal/pool/all/k/kong/${ce_pkg}" \
         -o ${ce_pkg}
     dpkg -i ${ce_pkg}
     apt-get -f install -y

diff --git a/variables.tf b/variables.tf
@@ -75,7 +75,7 @@ variable "availability_zones" {
 variable "ce_pkg" {
   description = "(Optional) Filename of the Community Edition package"
   type        = string
-  default     = "kong-2.3.2.focal.amd64.deb"
+  default     = "kong_2.3.2_amd64.deb"
 }
 
 variable "deck_version" {
@@ -127,7 +127,7 @@ variable "ee_creds_ssm_param" {
 variable "ee_pkg" {
   description = "(Optional) Filename of the Enterprise Edition package"
   type        = string
-  default     = "kong-enterprise-edition-2.3.2.0.focal.all.deb"
+  default     = "kong-enterprise-edition_2.3.2.0_all.deb"
 }
 
 variable "enable_monitoring" {