diff --git a/.github/ct.yaml b/.github/ct.yaml index c653b4c12..80e6a98e6 100644 --- a/.github/ct.yaml +++ b/.github/ct.yaml @@ -1,2 +1,3 @@ chart-repos: - bitnami=https://charts.bitnami.com/bitnami +target-branch: main diff --git a/Makefile b/Makefile index 4991ddf72..880be2439 100644 --- a/Makefile +++ b/Makefile @@ -95,8 +95,8 @@ backend-binary: run-generators build-backend-binary .PHONY: test-clean-work-tree-backend test-clean-work-tree-backend: - cd backend && \ - @if ! git diff --quiet -- go.mod go.sum pkg cmd updaters tools/tools.go; then \ + @cd backend && \ + if ! git diff --quiet -- go.mod go.sum pkg cmd updaters tools/tools.go; then \ echo; \ echo 'Working tree of backend code is not clean'; \ echo; \ diff --git a/backend/cmd/nebraska/nebraska.go b/backend/cmd/nebraska/nebraska.go index 3f24e3153..74c8f0c19 100644 --- a/backend/cmd/nebraska/nebraska.go +++ b/backend/cmd/nebraska/nebraska.go @@ -18,10 +18,11 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog" - swagger "github.com/kinvolk/nebraska/backend/api" swaggerFiles "github.com/swaggo/files" ginSwagger "github.com/swaggo/gin-swagger" + swagger "github.com/kinvolk/nebraska/backend/api" + "github.com/kinvolk/nebraska/backend/cmd/nebraska/auth" "github.com/kinvolk/nebraska/backend/pkg/api" "github.com/kinvolk/nebraska/backend/pkg/random" diff --git a/backend/pkg/api/bindata.go b/backend/pkg/api/bindata.go index 13c4595c6..65c5e8535 100644 --- a/backend/pkg/api/bindata.go +++ b/backend/pkg/api/bindata.go @@ -34,7 +34,7 @@ import ( func bindataRead(data []byte, name string) ([]byte, error) { gz, err := gzip.NewReader(bytes.NewBuffer(data)) if err != nil { - return nil, fmt.Errorf("read %q: %v", name, err) + return nil, fmt.Errorf("read %q: %w", name, err) } var buf bytes.Buffer @@ -42,7 +42,7 @@ func bindataRead(data []byte, name string) ([]byte, error) { clErr := gz.Close() if err != nil { - return nil, fmt.Errorf("read %q: %v", name, err) + return nil, fmt.Errorf("read %q: %w", name, err) } if clErr != nil { return nil, err @@ -491,6 +491,9 @@ var _bindata = map[string]func() (*asset, error){ "db/migrations/0013_add_stats_indexes.sql": dbMigrations0013_add_stats_indexesSql, } +// AssetDebug is true if the assets were built with the debug flag enabled. +const AssetDebug = false + // AssetDir returns the file names below a certain // directory embedded in the file by go-bindata. // For example if you run go-bindata on data/... and data contains the @@ -532,24 +535,24 @@ type bintree struct { } var _bintree = &bintree{nil, map[string]*bintree{ - "db": &bintree{nil, map[string]*bintree{ - "drop_all_tables.sql": &bintree{dbDrop_all_tablesSql, map[string]*bintree{}}, - "migrations": &bintree{nil, map[string]*bintree{ - "0001_initial.sql": &bintree{dbMigrations0001_initialSql, map[string]*bintree{}}, - "0002_event_data.sql": &bintree{dbMigrations0002_event_dataSql, map[string]*bintree{}}, - "0003_longer_team_names.sql": &bintree{dbMigrations0003_longer_team_namesSql, map[string]*bintree{}}, - "0004_rename_coreos_action.sql": &bintree{dbMigrations0004_rename_coreos_actionSql, map[string]*bintree{}}, - "0005_default_team_id.sql": &bintree{dbMigrations0005_default_team_idSql, map[string]*bintree{}}, - "0006_initial_application.sql": &bintree{dbMigrations0006_initial_applicationSql, map[string]*bintree{}}, - "0007_add_package_arch.sql": &bintree{dbMigrations0007_add_package_archSql, map[string]*bintree{}}, - "0008-arm-channels-groups.sql": &bintree{dbMigrations0008ArmChannelsGroupsSql, map[string]*bintree{}}, - "0009_group_track_names.sql": &bintree{dbMigrations0009_group_track_namesSql, map[string]*bintree{}}, - "0010_add_instance_alias.sql": &bintree{dbMigrations0010_add_instance_aliasSql, map[string]*bintree{}}, - "0011_add_composite_indexes.sql": &bintree{dbMigrations0011_add_composite_indexesSql, map[string]*bintree{}}, - "0012_drop_unused_indexes.sql": &bintree{dbMigrations0012_drop_unused_indexesSql, map[string]*bintree{}}, - "0013_add_stats_indexes.sql": &bintree{dbMigrations0013_add_stats_indexesSql, map[string]*bintree{}}, + "db": {nil, map[string]*bintree{ + "drop_all_tables.sql": {dbDrop_all_tablesSql, map[string]*bintree{}}, + "migrations": {nil, map[string]*bintree{ + "0001_initial.sql": {dbMigrations0001_initialSql, map[string]*bintree{}}, + "0002_event_data.sql": {dbMigrations0002_event_dataSql, map[string]*bintree{}}, + "0003_longer_team_names.sql": {dbMigrations0003_longer_team_namesSql, map[string]*bintree{}}, + "0004_rename_coreos_action.sql": {dbMigrations0004_rename_coreos_actionSql, map[string]*bintree{}}, + "0005_default_team_id.sql": {dbMigrations0005_default_team_idSql, map[string]*bintree{}}, + "0006_initial_application.sql": {dbMigrations0006_initial_applicationSql, map[string]*bintree{}}, + "0007_add_package_arch.sql": {dbMigrations0007_add_package_archSql, map[string]*bintree{}}, + "0008-arm-channels-groups.sql": {dbMigrations0008ArmChannelsGroupsSql, map[string]*bintree{}}, + "0009_group_track_names.sql": {dbMigrations0009_group_track_namesSql, map[string]*bintree{}}, + "0010_add_instance_alias.sql": {dbMigrations0010_add_instance_aliasSql, map[string]*bintree{}}, + "0011_add_composite_indexes.sql": {dbMigrations0011_add_composite_indexesSql, map[string]*bintree{}}, + "0012_drop_unused_indexes.sql": {dbMigrations0012_drop_unused_indexesSql, map[string]*bintree{}}, + "0013_add_stats_indexes.sql": {dbMigrations0013_add_stats_indexesSql, map[string]*bintree{}}, }}, - "sample_data.sql": &bintree{dbSample_dataSql, map[string]*bintree{}}, + "sample_data.sql": {dbSample_dataSql, map[string]*bintree{}}, }}, }} diff --git a/charts/nebraska/Chart.yaml b/charts/nebraska/Chart.yaml index 39b49d049..c4225fa2a 100644 --- a/charts/nebraska/Chart.yaml +++ b/charts/nebraska/Chart.yaml @@ -19,8 +19,8 @@ sources: maintainers: - name: kinvolk url: https://kinvolk.io/ -version: 0.1.5 -appVersion: "2.4.0" +version: 0.1.6 +appVersion: "2.4.1" dependencies: - name: postgresql