Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvements #60

Merged
merged 3 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .env.example
Original file line number Diff line number Diff line change
@@ -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
[email protected]
Expand Down
8 changes: 4 additions & 4 deletions docs/CUSTOMIZATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 | `[email protected]` | Default password for all the services deployed |
Expand Down
8 changes: 4 additions & 4 deletions src/clouds/aws/.env.example
Original file line number Diff line number Diff line change
@@ -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
[email protected]
Expand Down
8 changes: 4 additions & 4 deletions src/clouds/azure/.env.example
Original file line number Diff line number Diff line change
@@ -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
[email protected]
Expand Down
8 changes: 4 additions & 4 deletions src/clouds/gcp/.env.example
Original file line number Diff line number Diff line change
@@ -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
[email protected]
Expand Down
1 change: 1 addition & 0 deletions src/deployments/portal/openshift.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
);
Expand Down
21 changes: 14 additions & 7 deletions src/main/namespace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading