Skip to content

Remove slowDatabase references #16820

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

Merged
merged 2 commits into from
Mar 13, 2023
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
2 changes: 1 addition & 1 deletion .github/actions/deploy-gitpod/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ previewctl get-credentials --gcp-service-account "${PREVIEW_ENV_DEV_SA_KEY_PATH}
PREVIEW_NAME="$(previewctl get-name --branch "${INPUT_NAME}")"
export PREVIEW_NAME

for var in WITH_WS_MANAGER_MK2 WITH_DEDICATED_EMU WITH_EE_LICENSE WITH_SLOW_DATABASE ANALYTICS WORKSPACE_FEATURE_FLAGS; do
for var in WITH_WS_MANAGER_MK2 WITH_DEDICATED_EMU WITH_EE_LICENSE ANALYTICS WORKSPACE_FEATURE_FLAGS; do
input_var="INPUT_${var}"
if [[ -n "${!input_var:-}" ]];then
export GITPOD_${var}=${!input_var}
Expand Down
3 changes: 0 additions & 3 deletions .github/actions/deploy-gitpod/metadata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ inputs:
with_ee_licencse:
description: "Use EE license"
required: false
with_slow_database:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vulkoingim Also removed it from the gh-actions here

description: "Use slow database"
required: false
analytics:
description: "With analytics"
required: false
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ jobs:
with_ws_manager_mk2: ${{ contains( steps.pr-details.outputs.pr_body, '[X] with-ws-manager-mk2') }}
with_dedicated_emulation: ${{ contains( steps.pr-details.outputs.pr_body, '[X] with-dedicated-emulation') }}
with_ee_license: ${{ contains( steps.pr-details.outputs.pr_body, '[X] with-ee-license') }}
with_slow_database: ${{ contains( steps.pr-details.outputs.pr_body, '[X] with-slow-database') }}
analytics: ${{ contains( steps.pr-details.outputs.pr_body, '[X] analytics') }}
workspace_feature_flags: ${{ steps.output.outputs.workspace_feature_flags }}
pr_no_diff_skip: ${{ steps.pr-diff.outputs.pr_no_diff_skip }}
Expand Down Expand Up @@ -302,7 +301,6 @@ jobs:
with_ws_manager_mk2: ${{needs.configuration.outputs.with_ws_manager_mk2}}
with_dedicated_emulation: ${{needs.configuration.outputs.with_dedicated_emulation}}
with_ee_license: ${{needs.configuration.outputs.with_ee_license}}
with_slow_database: ${{needs.configuration.outputs.with_slow_database}}
analytics: ${{needs.configuration.outputs.analytics}}
workspace_feature_flags: ${{needs.configuration.outputs.workspace_feature_flags}}

Expand Down
1 change: 0 additions & 1 deletion .werft/jobs/build/deploy-to-preview-environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ export async function deployToPreviewEnvironment(werft: Werft, jobConfig: JobCon
analytics: deploymentConfig.analytics,
withEELicense: deploymentConfig.installEELicense,
workspaceFeatureFlags: workspaceFeatureFlags,
withSlowDatabase: jobConfig.withSlowDatabase,
withDedicatedEmulation: jobConfig.withDedicatedEmulation,
useWsManagerMk2: useWsManagerMk2,
});
Expand Down
2 changes: 0 additions & 2 deletions .werft/jobs/build/installer/installer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export type InstallerOptions = {
analytics?: Analytics;
withEELicense: boolean;
workspaceFeatureFlags: string[];
withSlowDatabase: boolean;
withDedicatedEmulation: boolean;
useWsManagerMk2: boolean;
};
Expand All @@ -31,7 +30,6 @@ export class Installer {
PREVIEW_NAME: this.options.previewName,
GITPOD_ANALYTICS: this.options.analytics,
GITPOD_WORKSPACE_FEATURE_FLAGS: this.options.workspaceFeatureFlags.join(" "),
GITPOD_WITH_SLOW_DATABASE: this.options.withSlowDatabase,
GITPOD_WITH_EE_LICENSE: this.options.withEELicense,
GITPOD_WITH_DEDICATED_EMU: this.options.withDedicatedEmulation,
GITPOD_WSMANAGER_MK2: this.options.useWsManagerMk2,
Expand Down
3 changes: 0 additions & 3 deletions .werft/jobs/build/job-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ export interface JobConfig {
withSelfHostedPreview: boolean;
withObservability: boolean;
withLocalPreview: boolean;
withSlowDatabase: boolean;
withDedicatedEmulation: boolean;
workspaceFeatureFlags: string[];
previewEnvironment: PreviewEnvironmentConfig;
Expand Down Expand Up @@ -109,7 +108,6 @@ export function jobConfig(werft: Werft, context: any): JobConfig {
const withLocalPreview = "with-local-preview" in buildConfig || mainBuild
const recreatePreview = "recreate-preview" in buildConfig
const recreateVm = mainBuild || "recreate-vm" in buildConfig;
const withSlowDatabase = "with-slow-database" in buildConfig && !mainBuild;
const withDedicatedEmulation = "with-dedicated-emulation" in buildConfig && !mainBuild;
const storageClass = buildConfig["storage-class"] || "";

Expand Down Expand Up @@ -187,7 +185,6 @@ export function jobConfig(werft: Werft, context: any): JobConfig {
certIssuer,
recreatePreview,
recreateVm,
withSlowDatabase,
withWerft,
withDedicatedEmulation,
useWsManagerMk2,
Expand Down
1 change: 0 additions & 1 deletion dev/preview/workflow/preview/deploy-gitpod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ GITPOD_PROXY_SECRET_NAME="proxy-config-certificates";
GITPOD_ANALYTICS="${GITPOD_ANALYTICS:-}"
GITPOD_WITH_EE_LICENSE="${GITPOD_WITH_EE_LICENSE:-true}"
GITPOD_WORKSPACE_FEATURE_FLAGS="${GITPOD_WORKSPACE_FEATURE_FLAGS:-}"
GITPOD_WITH_SLOW_DATABASE="${GITPOD_WITH_SLOW_DATABASE:-false}"
GITPOD_WITH_DEDICATED_EMU="${GITPOD_WITH_DEDICATED_EMU:-false}"
GITPOD_WSMANAGER_MK2="${GITPOD_WSMANAGER_MK2:-false}"

Expand Down
1 change: 0 additions & 1 deletion install/installer/pkg/config/v1/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ Additional config parameters that are in experimental state
|`experimental.webapp.stripe.individualUsagePriceIds.usd`|string|N| ||
|`experimental.webapp.stripe.teamUsagePriceIds.eur`|string|N| ||
|`experimental.webapp.stripe.teamUsagePriceIds.usd`|string|N| ||
|`experimental.webapp.slowDatabase`|bool|N| ||
|`experimental.webapp.iam`|IAMConfig|N| ||
|`experimental.ide.resolveLatest`|bool|N| | Disable resolution of latest images and use bundled latest versions instead|
|`experimental.ide.ideProxy.serviceAnnotations`||N| ||
Expand Down