diff --git a/.env.example b/.env.example index 06d7c036..6550b126 100644 --- a/.env.example +++ b/.env.example @@ -1,7 +1,7 @@ -DASHBOARD_VERSION=v5.4 -GATEWAY_VERSION=v5.4 -MDCB_VERSION=v2.6 -PUMP_VERSION=v1.10 +DASHBOARD_VERSION=v5.5 +GATEWAY_VERSION=v5.5 +MDCB_VERSION=v2.7 +PUMP_VERSION=v1.11 PORTAL_VERSION=v1.10 TYK_HELM_CHART_PATH=tyk-helm TYK_USERNAME=default@example.com diff --git a/docs/CUSTOMIZATION.md b/docs/CUSTOMIZATION.md index 4e28cb5a..d7c969e5 100644 --- a/docs/CUSTOMIZATION.md +++ b/docs/CUSTOMIZATION.md @@ -23,10 +23,10 @@ and they will be mapped to the respective `extraEnvs` section in the helm charts | Variable | Default | Comments | |--------------------------------------|:---------------------:|-----------------------------------------------------------------------------------------------------------------| -| DASHBOARD_VERSION | `v5.4` | Dashboard version | -| GATEWAY_VERSION | `v5.4` | Gateway version | -| MDCB_VERSION | `v2.6` | MDCB version | -| PUMP_VERSION | `v1.10` | Pump version | +| DASHBOARD_VERSION | `v5.5` | Dashboard version | +| GATEWAY_VERSION | `v5.5` | Gateway version | +| MDCB_VERSION | `v2.7` | MDCB version | +| PUMP_VERSION | `v1.11` | Pump version | | PORTAL_VERSION | `v1.10` | 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 | diff --git a/src/clouds/aws/.env.example b/src/clouds/aws/.env.example index 76dd9287..bf155b7d 100644 --- a/src/clouds/aws/.env.example +++ b/src/clouds/aws/.env.example @@ -1,7 +1,7 @@ -DASHBOARD_VERSION=v5.4 -GATEWAY_VERSION=v5.4 -MDCB_VERSION=v2.6 -PUMP_VERSION=v1.10 +DASHBOARD_VERSION=v5.5 +GATEWAY_VERSION=v5.5 +MDCB_VERSION=v2.7 +PUMP_VERSION=v1.11 PORTAL_VERSION=v1.10 TYK_HELM_CHART_PATH=tyk-helm TYK_USERNAME=default@example.com diff --git a/src/clouds/azure/.env.example b/src/clouds/azure/.env.example index 694194d9..06480607 100644 --- a/src/clouds/azure/.env.example +++ b/src/clouds/azure/.env.example @@ -1,7 +1,7 @@ -DASHBOARD_VERSION=v5.4 -GATEWAY_VERSION=v5.4 -MDCB_VERSION=v2.6 -PUMP_VERSION=v1.10 +DASHBOARD_VERSION=v5.5 +GATEWAY_VERSION=v5.5 +MDCB_VERSION=v2.7 +PUMP_VERSION=v1.11 PORTAL_VERSION=v1.10 TYK_HELM_CHART_PATH=tyk-helm TYK_USERNAME=default@example.com diff --git a/src/clouds/gcp/.env.example b/src/clouds/gcp/.env.example index a8e58916..37bd85a8 100644 --- a/src/clouds/gcp/.env.example +++ b/src/clouds/gcp/.env.example @@ -1,7 +1,7 @@ -DASHBOARD_VERSION=v5.4 -GATEWAY_VERSION=v5.4 -MDCB_VERSION=v2.6 -PUMP_VERSION=v1.10 +DASHBOARD_VERSION=v5.5 +GATEWAY_VERSION=v5.5 +MDCB_VERSION=v2.7 +PUMP_VERSION=v1.11 PORTAL_VERSION=v1.10 TYK_HELM_CHART_PATH=tyk-helm TYK_USERNAME=default@example.com diff --git a/src/deployments/portal/openshift.sh b/src/deployments/portal/openshift.sh index 83b75cf4..3d8234bd 100644 --- a/src/deployments/portal/openshift.sh +++ b/src/deployments/portal/openshift.sh @@ -3,6 +3,7 @@ if [[ $OPENSHIFT == "$flavor" ]]; then portalSecurityContextArgs=( --set "tyk-dev-portal.securityContext.fsGroup=$OS_UID_RANGE" \ --set "tyk-dev-portal.securityContext.runAsUser=$OS_UID_RANGE" \ + --set "tyk-dev-portal.containerSecurityContext.runAsUser=$OS_UID_RANGE" \ --set "server.statefulSet.securityContext.seccompProfile.type=RuntimeDefault" \ --set "server.statefulSet.containerSecurityContext.capabilities.drop[0]=ALL" \ ); diff --git a/src/main/namespace.sh b/src/main/namespace.sh index 2b7da08e..3b9d4328 100644 --- a/src/main/namespace.sh +++ b/src/main/namespace.sh @@ -20,19 +20,26 @@ if [[ $OPENSHIFT == "$flavor" ]]; then logger "$INFO" "using $OS_UID_RANGE for OpenShift security context values"; # Set Tyk args - tykSecurityContextArgs=(--set "tyk-dashboard.dashboard.securityContext.fsGroup=$OS_UID_RANGE" \ + tykSecurityContextArgs=( \ + --set "tyk-dashboard.dashboard.securityContext.fsGroup=$OS_UID_RANGE" \ --set "tyk-dashboard.dashboard.securityContext.runAsUser=$OS_UID_RANGE" \ - --set "tyk-dashboard.dashboard.securityContext.seccompProfile.type=RuntimeDefault" \ + --set "tyk-dashboard.dashboard.containerSecurityContext.runAsUser=$OS_UID_RANGE" \ --set "tyk-pump.pump.securityContext.fsGroup=$OS_UID_RANGE" \ --set "tyk-pump.pump.securityContext.runAsUser=$OS_UID_RANGE" \ - --set "tyk-pump.pump.securityContext.seccompProfile.type=RuntimeDefault"); + --set "tyk-pump.pump.containerSecurityContext.runAsUser=$OS_UID_RANGE" \ + --set "tyk-bootstrap.bootstrap.containerSecurityContext.runAsUser=$OS_UID_RANGE" \ + ); - gatewaySecurityContextArgs=(--set "tyk-gateway.gateway.securityContext.fsGroup=$OS_UID_RANGE" \ + gatewaySecurityContextArgs=( \ + --set "tyk-gateway.gateway.securityContext.fsGroup=$OS_UID_RANGE" \ --set "tyk-gateway.gateway.securityContext.runAsUser=$OS_UID_RANGE" \ - --set "tyk-gateway.gateway.securityContext.seccompProfile.type=RuntimeDefault"); + --set "tyk-gateway.gateway.containerSecurityContext.runAsUser=$OS_UID_RANGE" \ + ); # Set MDCB args - mdcbSecurityContextArgs=(--set "tyk-mdcb.mdcb.securityContext.fsGroup=$OS_UID_RANGE" \ + mdcbSecurityContextArgs=( \ + --set "tyk-mdcb.mdcb.securityContext.fsGroup=$OS_UID_RANGE" \ --set "tyk-mdcb.mdcb.securityContext.runAsUser=$OS_UID_RANGE" \ - --set "tyk-mdcb.mdcb.securityContext.seccompProfile.type=RuntimeDefault"); + --set "tyk-mdcb.mdcb.containerSecurityContext.runAsUser=$OS_UID_RANGE" \ + ); fi