Skip to content

Commit 543c16a

Browse files
ervczervcz
authored
Merge pull request #1091 from tylerauerbeck/update-kinvolk
Update `backend` Kinvolk references to Flatcar
2 parents 0de1c1c + 50170a9 commit 543c16a

58 files changed

Lines changed: 209 additions & 208 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.golangci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ formatters:
2727
simplify: true
2828
goimports:
2929
local-prefixes:
30-
- github.com/kinvolk/nebraska
30+
- github.com/flatcar/nebraska
3131
exclusions:
3232
generated: lax
3333
paths:

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1515
### Changed
1616

1717
- Postgresql 17.x is now the tested and default version. For existing Kubernetes deployment, you might need to run a manual intervention (see: [charts/nebraska/README.md](https://github.com/flatcar/nebraska/blob/main/charts/nebraska/README.md#upgrade-postgresql))([nebraska#1088](https://github.com/flatcar/nebraska/pull/1088))
18+
- backend: updated kinvolk references to flatcar ([nebraska#1091](https://github.com/flatcar/nebraska/pull/1091/files))
1819

1920
### Bugfixes
2021

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ To learn more about the Omaha protocol, please refer to the upstream docs [here]
4242

4343
<table>
4444
<tr>
45-
<td width="33%"><img src="https://github.com/kinvolk/nebraska/raw/screenshots/screenshots/main.png"></td>
46-
<td width="33%"><img src="https://github.com/kinvolk/nebraska/raw/screenshots/screenshots/flatcar_app.png"></td>
45+
<td width="33%"><img src="https://github.com/flatcar/nebraska/raw/screenshots/screenshots/main.png"></td>
46+
<td width="33%"><img src="https://github.com/flatcar/nebraska/raw/screenshots/screenshots/flatcar_app.png"></td>
4747
</tr>
4848
<tr>
49-
<td width="33%"><img src="https://github.com/kinvolk/nebraska/raw/screenshots/screenshots/group_details.png"></td>
50-
<td width="33%"><img src="https://github.com/kinvolk/nebraska/raw/screenshots/screenshots/instance_details.png"></td>
49+
<td width="33%"><img src="https://github.com/flatcar/nebraska/raw/screenshots/screenshots/group_details.png"></td>
50+
<td width="33%"><img src="https://github.com/flatcar/nebraska/raw/screenshots/screenshots/instance_details.png"></td>
5151
</tr>
5252
</table>
5353

‎backend/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ifeq ($(VERSION),)
2929
endif
3030
endif
3131

32-
LDFLAGS := "-w -X github.com/kinvolk/nebraska/backend/pkg/version.Version=$(VERSION) -extldflags \"-static\""
32+
LDFLAGS := "-w -X github.com/flatcar/nebraska/backend/pkg/version.Version=$(VERSION) -extldflags \"-static\""
3333
.PHONY: all
3434
all: codegen run-generators code-checks build
3535

‎backend/api/spec.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ info:
44
title: Nebraska
55
description: Nebraska is an update manager.
66
contact:
7-
name: Kinvolk
8-
email: hello@kinvolk.io
9-
url: http://kinvolk.io
7+
name: Flatcar Container Linux
8+
email: maintainers@flatcar-linux.org
9+
url: http://flatcar.org
1010
paths:
1111
/login:
1212
get:

‎backend/cmd/initdb/initdb.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package main
33
import (
44
"log"
55

6-
"github.com/kinvolk/nebraska/backend/pkg/api"
6+
"github.com/flatcar/nebraska/backend/pkg/api"
77
)
88

99
func main() {

‎backend/cmd/nebraska/main.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66
"github.com/labstack/gommon/log"
77
"github.com/rs/zerolog"
88

9-
db "github.com/kinvolk/nebraska/backend/pkg/api"
10-
"github.com/kinvolk/nebraska/backend/pkg/config"
11-
"github.com/kinvolk/nebraska/backend/pkg/metrics"
12-
"github.com/kinvolk/nebraska/backend/pkg/server"
13-
"github.com/kinvolk/nebraska/backend/pkg/syncer"
9+
db "github.com/flatcar/nebraska/backend/pkg/api"
10+
"github.com/flatcar/nebraska/backend/pkg/config"
11+
"github.com/flatcar/nebraska/backend/pkg/metrics"
12+
"github.com/flatcar/nebraska/backend/pkg/server"
13+
"github.com/flatcar/nebraska/backend/pkg/syncer"
1414
)
1515

1616
func main() {

‎backend/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/kinvolk/nebraska/backend
1+
module github.com/flatcar/nebraska/backend
22

33
go 1.23.0
44

‎backend/pkg/api/api.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/jmoiron/sqlx"
1313
migrate "github.com/rubenv/sql-migrate"
1414

15-
"github.com/kinvolk/nebraska/backend/pkg/logger"
15+
"github.com/flatcar/nebraska/backend/pkg/logger"
1616

1717
// PostgreSQL Driver and Toolkit
1818
_ "github.com/jackc/pgx/v4/stdlib"

‎backend/pkg/api/applications_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ func TestGetApp(t *testing.T) {
170170
_, err = a.GetApp(uuid.New().String())
171171
assert.Error(t, err, "Trying to get non existent app.")
172172

173-
tApp1, err := a.AddApp(&Application{Name: "test_app1", ProductID: null.StringFrom("io.kinvolk.MyNewApp"), TeamID: tTeam.ID})
173+
tApp1, err := a.AddApp(&Application{Name: "test_app1", ProductID: null.StringFrom("io.flatcar.MyNewApp"), TeamID: tTeam.ID})
174174
assert.NoError(t, err)
175175
assert.NotEqual(t, null.StringFrom(""), tApp1.ProductID)
176176

@@ -186,7 +186,7 @@ func TestGetApp(t *testing.T) {
186186
assert.Equal(t, tApp1.ProductID, app.ProductID)
187187

188188
// App with same product_id
189-
_, err = a.AddApp(&Application{Name: "test_app2", ProductID: null.StringFrom("io.kinvolk.MyNewApp"), TeamID: tTeam.ID})
189+
_, err = a.AddApp(&Application{Name: "test_app2", ProductID: null.StringFrom("io.flatcar.MyNewApp"), TeamID: tTeam.ID})
190190
assert.Error(t, err)
191191

192192
// App with a default product_id, to test the constraint is not limiting too much
@@ -220,7 +220,7 @@ func TestGetAppIDs(t *testing.T) {
220220

221221
tTeam, _ := a.AddTeam(&Team{Name: "test_team"})
222222
tApp1, _ := a.AddApp(&Application{Name: "test_app1", TeamID: tTeam.ID})
223-
tApp2, _ := a.AddApp(&Application{Name: "test_app2", TeamID: tTeam.ID, ProductID: null.StringFrom("io.kinvolk.MyApp2")})
223+
tApp2, _ := a.AddApp(&Application{Name: "test_app2", TeamID: tTeam.ID, ProductID: null.StringFrom("io.flatcar.MyApp2")})
224224

225225
apps, err := a.GetApps(tTeam.ID, 0, 0)
226226
assert.NoError(t, err)
@@ -236,7 +236,7 @@ func TestGetAppIDs(t *testing.T) {
236236
assert.NoError(t, err)
237237
assert.Equal(t, tApp2.ID, app2ID)
238238

239-
_, err = a.GetAppID("io.kinvolk.InvalidApp")
239+
_, err = a.GetAppID("io.flatcar.InvalidApp")
240240
assert.Error(t, err)
241241

242242
_, err = a.GetAppID("")
@@ -245,35 +245,35 @@ func TestGetAppIDs(t *testing.T) {
245245
_, err = a.GetAppID("{")
246246
assert.Error(t, err)
247247

248-
app2ID, err = a.GetAppID("io.kinvolk.MyApp2")
248+
app2ID, err = a.GetAppID("io.flatcar.MyApp2")
249249
assert.NoError(t, err)
250250
assert.Equal(t, tApp2.ID, app2ID)
251251

252-
tApp3, err := a.AddApp(&Application{Name: "test_app3", TeamID: tTeam.ID, ProductID: null.StringFrom("io.kinvolk.MyApp3")})
252+
tApp3, err := a.AddApp(&Application{Name: "test_app3", TeamID: tTeam.ID, ProductID: null.StringFrom("io.flatcar.MyApp3")})
253253
assert.NoError(t, err)
254254

255-
app3ID, err := a.GetAppID("io.kinvolk.MyApp3")
255+
app3ID, err := a.GetAppID("io.flatcar.MyApp3")
256256
assert.NoError(t, err)
257257
assert.Equal(t, tApp3.ID, app3ID)
258258

259-
tApp2.ProductID = null.StringFrom("io.kinvolk.App")
259+
tApp2.ProductID = null.StringFrom("io.flatcar.App")
260260
err = a.UpdateApp(tApp2)
261261
assert.NoError(t, err)
262262

263-
_, err = a.GetAppID("io.kinvolk.MyApp2")
263+
_, err = a.GetAppID("io.flatcar.MyApp2")
264264
assert.Error(t, err)
265265
assert.Equal(t, tApp2.ID, app2ID)
266266

267-
app2ID, err = a.GetAppID("io.kinvolk.App")
267+
app2ID, err = a.GetAppID("io.flatcar.App")
268268
assert.NoError(t, err)
269269
assert.Equal(t, tApp2.ID, app2ID)
270270

271-
wrappedInBrackets := "{io.kinvolk.App}"
271+
wrappedInBrackets := "{io.flatcar.App}"
272272
app2ID, err = a.GetAppID(wrappedInBrackets)
273273
assert.NoError(t, err)
274274
assert.Equal(t, tApp2.ID, app2ID)
275275

276-
caseInsensitive := "io.Kinvolk.app"
276+
caseInsensitive := "io.Flatcar.app"
277277
app2ID, err = a.GetAppID(caseInsensitive)
278278
assert.NoError(t, err)
279279
assert.Equal(t, tApp2.ID, app2ID)

0 commit comments

Comments
 (0)