Skip to content

Commit 172e146

Browse files
authored
Remove references to enterprise licenses (#17008)
Signed-off-by: Manuel de Brito Fontes <[email protected]>
1 parent d9f1988 commit 172e146

File tree

5 files changed

+1
-16
lines changed

5 files changed

+1
-16
lines changed

.github/actions/deploy-gitpod/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ previewctl get-credentials --gcp-service-account "${PREVIEW_ENV_DEV_SA_KEY_PATH}
2929
PREVIEW_NAME="$(previewctl get-name --branch "${INPUT_NAME}")"
3030
export PREVIEW_NAME
3131

32-
for var in WSMANAGER_MK2 WITH_DEDICATED_EMU WITH_EE_LICENSE ANALYTICS WORKSPACE_FEATURE_FLAGS; do
32+
for var in WSMANAGER_MK2 WITH_DEDICATED_EMU ANALYTICS WORKSPACE_FEATURE_FLAGS; do
3333
input_var="INPUT_${var}"
3434
if [[ -n "${!input_var:-}" ]];then
3535
export GITPOD_${var}=${!input_var}

.github/pull_request_template.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ Does this PR require updates to the documentation at www.gitpod.io/docs?
4747
<details>
4848
<summary>Installer Options</summary>
4949

50-
- [ ] with-ee-license
5150
- [ ] with-dedicated-emulation
5251
- [ ] with-ws-manager-mk2
5352
- [ ] workspace-feature-flags

.github/workflows/build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ jobs:
3131
publish_to_jbmp: ${{ contains( steps.pr-details.outputs.pr_body, '[X] /werft publish-to-jb-marketplace') }}
3232
with_ws_manager_mk2: ${{ contains( steps.pr-details.outputs.pr_body, '[X] with-ws-manager-mk2') }}
3333
with_dedicated_emulation: ${{ contains( steps.pr-details.outputs.pr_body, '[X] with-dedicated-emulation') }}
34-
with_ee_license: ${{ contains( steps.pr-details.outputs.pr_body, '[X] with-ee-license') }}
3534
analytics: ${{ contains( steps.pr-details.outputs.pr_body, '[X] analytics') }}
3635
workspace_feature_flags: ${{ steps.output.outputs.workspace_feature_flags }}
3736
pr_no_diff_skip: ${{ steps.pr-diff.outputs.pr_no_diff_skip }}
@@ -298,7 +297,6 @@ jobs:
298297
previewctl_hash: ${{ needs.build-previewctl.outputs.previewctl_hash }}
299298
wsmanager_mk2: ${{needs.configuration.outputs.with_ws_manager_mk2}}
300299
with_dedicated_emulation: ${{needs.configuration.outputs.with_dedicated_emulation}}
301-
with_ee_license: ${{needs.configuration.outputs.with_ee_license}}
302300
analytics: ${{needs.configuration.outputs.analytics}}
303301
workspace_feature_flags: ${{needs.configuration.outputs.workspace_feature_flags}}
304302

.werft/jobs/build/installer/installer.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export class Installer {
3030
PREVIEW_NAME: this.options.previewName,
3131
GITPOD_ANALYTICS: this.options.analytics,
3232
GITPOD_WORKSPACE_FEATURE_FLAGS: this.options.workspaceFeatureFlags.join(" "),
33-
GITPOD_WITH_EE_LICENSE: this.options.withEELicense,
3433
GITPOD_WITH_DEDICATED_EMU: this.options.withDedicatedEmulation,
3534
GITPOD_WSMANAGER_MK2: this.options.useWsManagerMk2,
3635
};

dev/preview/workflow/preview/deploy-gitpod.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ GITPOD_CONTAINER_REGISTRY_URL="eu.gcr.io/gitpod-core-dev/build/";
2626
GITPOD_IMAGE_PULL_SECRET_NAME="gcp-sa-registry-auth";
2727
GITPOD_PROXY_SECRET_NAME="proxy-config-certificates";
2828
GITPOD_ANALYTICS="${GITPOD_ANALYTICS:-}"
29-
GITPOD_WITH_EE_LICENSE="${GITPOD_WITH_EE_LICENSE:-true}"
3029
GITPOD_WORKSPACE_FEATURE_FLAGS="${GITPOD_WORKSPACE_FEATURE_FLAGS:-}"
3130
GITPOD_WITH_DEDICATED_EMU="${GITPOD_WITH_DEDICATED_EMU:-false}"
3231
GITPOD_WSMANAGER_MK2="${GITPOD_WSMANAGER_MK2:-false}"
@@ -535,16 +534,6 @@ installer --debug-version-file="/tmp/versions.yaml" render \
535534

536535
log_info "Post-processing"
537536

538-
#
539-
# configureLicense
540-
#
541-
if [[ "${GITPOD_WITH_EE_LICENSE}" == "true" ]]
542-
then
543-
readWerftSecret "gpsh-harvester-license" "license" > /tmp/license
544-
else
545-
touch /tmp/license
546-
fi
547-
548537
#
549538
# configureWorkspaceFeatureFlags
550539
#

0 commit comments

Comments
 (0)