Skip to content

Commit

Permalink
Add disableMigration to webapp config
Browse files Browse the repository at this point in the history
Use it to skip rendering:
* the `migration' job.
* the `dbinit-session` job.
* the `dbinit-scripts` configmaps.
  • Loading branch information
Andrew Farries committed May 5, 2022
1 parent 82a229a commit 1a62c90
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 1 deletion.
11 changes: 11 additions & 0 deletions install/installer/pkg/common/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,17 @@ func NodeAffinity(orLabels ...string) *corev1.Affinity {
}
}

func IsDatabaseMigrationEnabled(ctx *RenderContext) bool {
disableMigration := false
_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
if cfg.WebApp != nil {
disableMigration = cfg.WebApp.DisableMigration
}
return nil
})
return disableMigration
}

func Replicas(ctx *RenderContext, component string) *int32 {
replicas := int32(1)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ import (
var initScriptFiles embed.FS

func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
if disableMigration := common.IsDatabaseMigrationEnabled(ctx); disableMigration {
return nil, nil
}

initScripts, err := fs.ReadDir(initScriptFiles, initScriptDir)
if err != nil {
return nil, err
Expand Down
7 changes: 6 additions & 1 deletion install/installer/pkg/components/database/init/configmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ package init
import (
"embed"
"fmt"
"github.com/gitpod-io/gitpod/installer/pkg/common"
"io/fs"

"github.com/gitpod-io/gitpod/installer/pkg/common"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand All @@ -18,6 +19,10 @@ import (
var initScriptFiles embed.FS

func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
if disableMigration := common.IsDatabaseMigrationEnabled(ctx); disableMigration {
return nil, nil
}

initScripts, err := fs.ReadDir(initScriptFiles, initScriptDir)
if err != nil {
return nil, err
Expand Down
5 changes: 5 additions & 0 deletions install/installer/pkg/components/database/init/job.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ package init

import (
"fmt"

"github.com/gitpod-io/gitpod/installer/pkg/cluster"

"github.com/gitpod-io/gitpod/installer/pkg/common"
Expand All @@ -19,6 +20,10 @@ import (
)

func job(ctx *common.RenderContext) ([]runtime.Object, error) {
if disableMigration := common.IsDatabaseMigrationEnabled(ctx); disableMigration {
return nil, nil
}

objectMeta := metav1.ObjectMeta{
Name: fmt.Sprintf("%s-session", Component),
Namespace: ctx.Namespace,
Expand Down
4 changes: 4 additions & 0 deletions install/installer/pkg/components/migrations/job.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ import (
)

func job(ctx *common.RenderContext) ([]runtime.Object, error) {
if disableMigration := common.IsDatabaseMigrationEnabled(ctx); disableMigration {
return nil, nil
}

objectMeta := metav1.ObjectMeta{
Name: Component,
Namespace: ctx.Namespace,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ type WebAppConfig struct {
ProxyConfig *ProxyConfig `json:"proxy,omitempty"`
WorkspaceManagerBridge *WsManagerBridgeConfig `json:"wsManagerBridge,omitempty"`
UsePodAntiAffinity bool `json:"usePodAntiAffinity"`
DisableMigration bool `json:"disableMigration"`
}

type WorkspaceDefaults struct {
Expand Down

0 comments on commit 1a62c90

Please sign in to comment.