V5.6 (#65)

* Update versions
TykTechnologies · Oct 18, 2024 · 70a9f53 · 70a9f53
1 parent 976cc38
commit 70a9f53
Show file tree

Hide file tree

Showing 21 changed files with 231 additions and 81 deletions.
diff --git a/.env.example b/.env.example
@@ -1,15 +1,16 @@
-DASHBOARD_VERSION=v5.5
-GATEWAY_VERSION=v5.5
+DASHBOARD_VERSION=v5.6
+GATEWAY_VERSION=v5.6
 MDCB_VERSION=v2.7
 PUMP_VERSION=v1.11
-PORTAL_VERSION=v1.10
+PORTAL_VERSION=v1.11
 TYK_HELM_CHART_PATH=tyk-helm
 TYK_USERNAME=default@example.com
 TYK_PASSWORD=topsecretpassword
 TYK_TIMEOUT=600s
 LICENSE=
 MDCB_LICENSE=
 PORTAL_LICENSE=
+OPERATOR_LICENSE=
 
 TYK_WORKER_CONNECTIONSTRING=
 TYK_WORKER_ORGID=

diff --git a/.github/workflows/tyk-cp.yml b/.github/workflows/tyk-cp.yml
@@ -76,6 +76,7 @@ jobs:
             LICENSE="${{ secrets.DASH_LICENSE }}" \
             MDCB_LICENSE="${{ secrets.MDCB_LICENSE }}" \
             PORTAL_LICENSE="${{ secrets.DASH_LICENSE }}" \
+            OPERATOR_LICENSE="${{ secrets.DASH_LICENSE }}" \
             ./up.sh -v \
               --redis redis \
               --namespace tyk-cp-${{ matrix.deployment }} \
@@ -97,6 +98,7 @@ jobs:
             LICENSE="${{ secrets.DASH_LICENSE }}" \
             MDCB_LICENSE="${{ secrets.MDCB_LICENSE }}" \
             PORTAL_LICENSE="${{ secrets.DASH_LICENSE }}" \
+            OPERATOR_LICENSE="${{ secrets.DASH_LICENSE }}" \
             ./up.sh -v \
               --redis redis \
               --namespace tyk-cp-${{ matrix.deployment }} \
@@ -116,6 +118,7 @@ jobs:
             LICENSE="${{ secrets.DASH_LICENSE }}" \
             MDCB_LICENSE="${{ secrets.MDCB_LICENSE }}" \
             PORTAL_LICENSE="${{ secrets.DASH_LICENSE }}" \
+            OPERATOR_LICENSE="${{ secrets.DASH_LICENSE }}" \
             ./up.sh -v \
               --redis redis \
               --namespace tyk-cp-${{ matrix.deployment }} \

diff --git a/.github/workflows/tyk-dp.yml b/.github/workflows/tyk-dp.yml
@@ -71,6 +71,7 @@ jobs:
             TYK_WORKER_ORGID="${{ secrets.TYK_WORKER_ORGID }}" \
             TYK_WORKER_AUTHTOKEN="${{ secrets.TYK_WORKER_AUTHTOKEN }}" \
             TYK_WORKER_OPERATOR_CONNECTIONSTRING="${{ secrets.TYK_WORKER_OPERATOR_CONNECTIONSTRING }}" \
+            OPERATOR_LICENSE="${{ secrets.DASH_LICENSE }}" \
             DATADOG_APIKEY="${{ secrets.DATADOG_APIKEY }}" \
             DATADOG_APPKEY="${{ secrets.DATADOG_APPKEY }}" \
             NEWRELIC_LICENSEKEY="${{ secrets.NEWRELIC_LICENSEKEY }}" \
@@ -93,6 +94,7 @@ jobs:
             TYK_WORKER_ORGID="${{ secrets.TYK_WORKER_ORGID }}" \
             TYK_WORKER_AUTHTOKEN="${{ secrets.TYK_WORKER_AUTHTOKEN }}" \
             TYK_WORKER_OPERATOR_CONNECTIONSTRING="${{ secrets.TYK_WORKER_OPERATOR_CONNECTIONSTRING }}" \
+            OPERATOR_LICENSE="${{ secrets.DASH_LICENSE }}" \
             DATADOG_APIKEY="${{ secrets.DATADOG_APIKEY }}" \
             DATADOG_APPKEY="${{ secrets.DATADOG_APPKEY }}" \
             NEWRELIC_LICENSEKEY="${{ secrets.NEWRELIC_LICENSEKEY }}" \
@@ -113,6 +115,7 @@ jobs:
             TYK_WORKER_ORGID="${{ secrets.TYK_WORKER_ORGID }}" \
             TYK_WORKER_AUTHTOKEN="${{ secrets.TYK_WORKER_AUTHTOKEN }}" \
             TYK_WORKER_OPERATOR_CONNECTIONSTRING="${{ secrets.TYK_WORKER_OPERATOR_CONNECTIONSTRING }}" \
+            OPERATOR_LICENSE="${{ secrets.DASH_LICENSE }}" \
             DATADOG_APIKEY="${{ secrets.DATADOG_APIKEY }}" \
             DATADOG_APPKEY="${{ secrets.DATADOG_APPKEY }}" \
             NEWRELIC_LICENSEKEY="${{ secrets.NEWRELIC_LICENSEKEY }}" \

diff --git a/.github/workflows/tyk-gateway.yml b/.github/workflows/tyk-gateway.yml
@@ -26,15 +26,8 @@ jobs:
           - jaeger
           - k6
           - keycloak
-          - keycloak-jwt
           - newrelic
           - opensearch
-          - operator
-          - operator-federation
-          - operator-graphql
-          - operator-httpbin
-          - operator-jwt-hmac
-          - operator-udg
           - prometheus
           - prometheus-grafana
           - vault

diff --git a/.github/workflows/tyk-stack.yml b/.github/workflows/tyk-stack.yml
@@ -75,6 +75,7 @@ jobs:
             NEWRELIC_LICENSEKEY="${{ secrets.NEWRELIC_LICENSEKEY }}" \
             LICENSE="${{ secrets.DASH_LICENSE }}" \
             PORTAL_LICENSE="${{ secrets.DASH_LICENSE }}" \
+            OPERATOR_LICENSE="${{ secrets.DASH_LICENSE }}" \
             ./up.sh -v \
               --redis redis \
               --namespace tyk-stack-${{ matrix.deployment }} \
@@ -95,6 +96,7 @@ jobs:
             NEWRELIC_LICENSEKEY="${{ secrets.NEWRELIC_LICENSEKEY }}" \
             LICENSE="${{ secrets.DASH_LICENSE }}" \
             PORTAL_LICENSE="${{ secrets.DASH_LICENSE }}" \
+            OPERATOR_LICENSE="${{ secrets.DASH_LICENSE }}" \
             ./up.sh -v \
               --redis redis \
               --namespace tyk-stack-${{ matrix.deployment }} \
@@ -113,6 +115,7 @@ jobs:
             NEWRELIC_LICENSEKEY="${{ secrets.NEWRELIC_LICENSEKEY }}" \
             LICENSE="${{ secrets.DASH_LICENSE }}" \
             PORTAL_LICENSE="${{ secrets.DASH_LICENSE }}" \
+            OPERATOR_LICENSE="${{ secrets.DASH_LICENSE }}" \
             ./up.sh -v \
               --redis redis \
               --namespace tyk-stack-${{ matrix.deployment }} \

diff --git a/README.md b/README.md
@@ -48,8 +48,8 @@ cd tyk-k8s-demo
 cp .env.example .env
 ```
 
-Depending on the deployments you would like to install set values of the `LICENSE`, `MDCB_LICENSE`, and `PORTAL_LICENSE`
-inside the `.env` file.
+Depending on the deployments you would like to install set values of the `LICENSE`, `MDCB_LICENSE`, `PORTAL_LICENSE`
+`OPERATOR_LICENSE`, inside the `.env` file.
 
 ### Minikube
 If you are deploying this demo on [Minikube](https://minikube.sigs.k8s.io/docs/start),

diff --git a/docs/CUSTOMIZATION.md b/docs/CUSTOMIZATION.md
@@ -23,17 +23,18 @@ and they will be mapped to the respective `extraEnvs` section in the helm charts
 
 | Variable                             |        Default        | Comments                                                                                                        |
 |--------------------------------------|:---------------------:|-----------------------------------------------------------------------------------------------------------------|
-| DASHBOARD_VERSION                    |        `v5.5`         | Dashboard version                                                                                               |
-| GATEWAY_VERSION                      |        `v5.5`         | Gateway version                                                                                                 |
+| DASHBOARD_VERSION                    |        `v5.6`         | Dashboard version                                                                                               |
+| GATEWAY_VERSION                      |        `v5.6`         | Gateway version                                                                                                 |
 | MDCB_VERSION                         |        `v2.7`         | MDCB version                                                                                                    |
 | PUMP_VERSION                         |        `v1.11`        | Pump version                                                                                                    |
-| PORTAL_VERSION                       |        `v1.10`        | Portal version                                                                                                  |
+| PORTAL_VERSION                       |        `v1.11`        | Portal version                                                                                                  |
 | TYK_HELM_CHART_PATH                  |      `tyk-helm`       | Path to charts, can be a local directory or a helm repo                                                         |
 | TYK_USERNAME                         | `default@example.com` | Default password for all the services deployed                                                                  |
 | TYK_PASSWORD                         |  `topsecretpassword`  | Default password for all the services deployed                                                                  |
 | LICENSE                              |                       | Dashboard license                                                                                               |
 | MDCB_LICENSE                         |                       | MDCB license                                                                                                    |
 | PORTAL_LICENSE                       |                       | Portal license                                                                                                  |
+| OPERATOR_LICENSE                     |                       | Portal license                                                                                                  |
 | TYK_WORKER_CONNECTIONSTRING          |                       | MDCB URL for worker connection                                                                                  |
 | TYK_WORKER_ORGID                     |                       | Org ID of dashboard user                                                                                        |
 | TYK_WORKER_AUTHTOKEN                 |                       | Auth token of dashboard user                                                                                    |

diff --git a/docs/FEATURES_MATRIX.md b/docs/FEATURES_MATRIX.md
@@ -2,10 +2,10 @@
 
 | Deployment           | OpenShift Support  |    ARM Support     |      CI Tests      |    Postman Test    |        SSL         |                                              Chart/Manifest                                              | Version |
 |----------------------|:------------------:|:------------------:|:------------------:|:------------------:|:------------------:|:--------------------------------------------------------------------------------------------------------:|:-------:|
-| tyk-gateway          | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |                        [tyk-helm](https://helm.tyk.io/public/helm/charts)/tyk-oss                        |  1.6.0  |
-| tyk-dp               | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |                    [tyk-helm](https://helm.tyk.io/public/helm/charts)/tyk-data-plane                     |  1.6.0  |
-| tyk-stack            | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |                       [tyk-helm](https://helm.tyk.io/public/helm/charts)/tyk-stack                       |  1.6.0  |
-| tyk-cp               | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |                   [tyk-helm](https://helm.tyk.io/public/helm/charts)/tyk-control-plane                   |  1.6.0  |
+| tyk-gateway          | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |                        [tyk-helm](https://helm.tyk.io/public/helm/charts)/tyk-oss                        |  2.1.0  |
+| tyk-dp               | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |                    [tyk-helm](https://helm.tyk.io/public/helm/charts)/tyk-data-plane                     |  2.1.0  |
+| tyk-stack            | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |                       [tyk-helm](https://helm.tyk.io/public/helm/charts)/tyk-stack                       |  2.1.0  |
+| tyk-cp               | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |                   [tyk-helm](https://helm.tyk.io/public/helm/charts)/tyk-control-plane                   |  2.1.0  |
 | cert-manager         | :white_check_mark: | :white_check_mark: | :white_check_mark: |        N/A         |        N/A         |                           [jetstack](https://charts.jetstack.io)/cert-manager                            | 1.15.1  |
 | datadog              | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |        N/A         |                              [datadog](https://helm.datadoghq.com)/datadog                               | 3.69.0  |
 | elasticsearch        | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |                       [bitnami](https://charts.bitnami.com/bitnami)/elasticsearch                        | 21.3.5  |
@@ -26,7 +26,7 @@
 | operator-httpbin     | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |     :no_entry:     |                                                   N/A                                                    |   N/A   |
 | operator-jwt-hmac    | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |        N/A         |                                                   N/A                                                    |   N/A   |
 | operator-udg         | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |     :no_entry:     |                                                   N/A                                                    |   N/A   |
-| portal               | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |                    [tyk-helm](https://helm.tyk.io/public/helm/charts)/tyk-dev-portal                     |  1.6.0  |
+| portal               | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |                    [tyk-helm](https://helm.tyk.io/public/helm/charts)/tyk-dev-portal                     |  2.1.0  |
 | prometheus           |     :no_entry:     | :white_check_mark: | :white_check_mark: | :white_check_mark: |     :no_entry:     |          [prometheus-community](https://prometheus-community.github.io/helm-charts)/prometheus           | 25.24.1 |
 | prometheus-grafana   |     :warning:      | :white_check_mark: | :white_check_mark: | :white_check_mark: |     :no_entry:     |                         [grafana](https://grafana.github.io/helm-charts)/grafana                         |  8.3.6  |
 | vault                | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |     :no_entry:     |                          [hashicorp](https://helm.releases.hashicorp.com)/vault                          | 0.28.1  |
@@ -40,19 +40,19 @@
 | elasticsearch-kibana | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | jaeger               | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | k6                   | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| k6-slo-traffic       | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| k6-slo-traffic       |        N/A         | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | keycloak             | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | keycloak-dcr         |        N/A         | :white_check_mark: | :white_check_mark: |        N/A         |
-| keycloak-jwt         | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| keycloak-jwt         |        N/A         | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | keycloak-sso         |        N/A         | :white_check_mark: | :white_check_mark: |        N/A         |
 | newrelic             | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| opa                  | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| operator             | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| operator-federation  | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| operator-graphql     | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| operator-httpbin     | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| operator-jwt-hmac    | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| operator-udg         | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| opa                  |        N/A         | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| operator             |        N/A         | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| operator-federation  |        N/A         | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| operator-graphql     |        N/A         | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| operator-httpbin     |        N/A         | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| operator-jwt-hmac    |        N/A         | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| operator-udg         |        N/A         | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | portal               |        N/A         | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | prometheus           | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | prometheus-grafana   | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |

diff --git a/src/clouds/aws/.env.example b/src/clouds/aws/.env.example
@@ -1,14 +1,16 @@
-DASHBOARD_VERSION=v5.5
-GATEWAY_VERSION=v5.5
+DASHBOARD_VERSION=v5.6
+GATEWAY_VERSION=v5.6
 MDCB_VERSION=v2.7
 PUMP_VERSION=v1.11
-PORTAL_VERSION=v1.10
+PORTAL_VERSION=v1.11
 TYK_HELM_CHART_PATH=tyk-helm
 TYK_USERNAME=default@example.com
 TYK_PASSWORD=topsecretpassword
 LICENSE=
 MDCB_LICENSE=
 PORTAL_LICENSE=
+OPERATOR_LICENSE=
+
 TYK_WORKER_CONNECTIONSTRING=
 TYK_WORKER_ORGID=
 TYK_WORKER_AUTHTOKEN=

diff --git a/src/clouds/aws/main.tf b/src/clouds/aws/main.tf
@@ -21,28 +21,29 @@ module "vpc" {
 
 module "eks" {
 	source  = "terraform-aws-modules/eks/aws"
-	version = "20.8.2"
 
 	cluster_name    = "tyk-demo-${var.cluster_location}"
 	cluster_version = "1.29"
 
 	vpc_id     = module.vpc.vpc_id
 	subnet_ids = module.vpc.private_subnets
 
+	create_cloudwatch_log_group = false
+
 	cluster_endpoint_public_access = true
 	enable_cluster_creator_admin_permissions = true
 }
 
 module "eks_node_groups" {
 	source   = "terraform-aws-modules/eks/aws//modules/eks-managed-node-group"
-	version  = "20.8.2"
-
-	name            = "${module.eks.cluster_name}-np"
-	cluster_name    = module.eks.cluster_name
-	cluster_version = module.eks.cluster_version
-	subnet_ids      = module.vpc.private_subnets
-	desired_size    = var.cluster_node_count
-	instance_types  = [var.cluster_machine_type]
+
+	name                 = "${module.eks.cluster_name}-np"
+	cluster_name         = module.eks.cluster_name
+	cluster_version      = module.eks.cluster_version
+	subnet_ids           = module.vpc.private_subnets
+	desired_size         = var.cluster_node_count
+	instance_types       = [var.cluster_machine_type]
+	cluster_service_cidr = module.eks.cluster_service_cidr
 }
 
 module "ebs_csi_controller_role" {

diff --git a/src/clouds/azure/.env.example b/src/clouds/azure/.env.example
@@ -1,14 +1,16 @@
-DASHBOARD_VERSION=v5.5
-GATEWAY_VERSION=v5.5
+DASHBOARD_VERSION=v5.6
+GATEWAY_VERSION=v5.6
 MDCB_VERSION=v2.7
 PUMP_VERSION=v1.11
-PORTAL_VERSION=v1.10
+PORTAL_VERSION=v1.11
 TYK_HELM_CHART_PATH=tyk-helm
 TYK_USERNAME=default@example.com
 TYK_PASSWORD=topsecretpassword
 LICENSE=
 MDCB_LICENSE=
 PORTAL_LICENSE=
+OPERATOR_LICENSE=
+
 TYK_WORKER_CONNECTIONSTRING=
 TYK_WORKER_ORGID=
 TYK_WORKER_AUTHTOKEN=

diff --git a/src/clouds/gcp/.env.example b/src/clouds/gcp/.env.example
@@ -1,14 +1,16 @@
-DASHBOARD_VERSION=v5.5
-GATEWAY_VERSION=v5.5
+DASHBOARD_VERSION=v5.6
+GATEWAY_VERSION=v5.6
 MDCB_VERSION=v2.7
 PUMP_VERSION=v1.11
-PORTAL_VERSION=v1.10
+PORTAL_VERSION=v1.11
 TYK_HELM_CHART_PATH=tyk-helm
 TYK_USERNAME=default@example.com
 TYK_PASSWORD=topsecretpassword
 LICENSE=
 MDCB_LICENSE=
 PORTAL_LICENSE=
+OPERATOR_LICENSE=
+
 TYK_WORKER_CONNECTIONSTRING=
 TYK_WORKER_ORGID=
 TYK_WORKER_AUTHTOKEN=