Skip to content

Commit

Permalink
chore: merge issues fixed; missing reuse header added #639
Browse files Browse the repository at this point in the history
  • Loading branch information
@jgriegershs
jgriegershs committed Nov 5, 2024
1 parent c231ba9 commit 353577e
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 48 deletions.
3 changes: 3 additions & 0 deletions k2s/internal/core/node/copy/copy.go
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// SPDX-FileCopyrightText: © 2024 Siemens Healthineers AG
// SPDX-License-Identifier: MIT

package copy

import (
Expand Down
11 changes: 5 additions & 6 deletions k2s/test/e2e/cli/cmd/addons/nosetup/corruptedstate/addons_corrupted-state_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,11 @@ var _ = Describe("addons commands", Ordered, func() {

BeforeEach(func() {
inputConfig := &setupinfo.Config{
SetupName: "k2s",
Registries: []string{"r1", "r2"},
LoggedInRegistry: "r2",
LinuxOnly: true,
Version: "test-version",
Corrupted: true,
SetupName: "k2s",
Registries: []string{"r1", "r2"},
LinuxOnly: true,
Version: "test-version",
Corrupted: true,
}
inputData, err := json.Marshal(inputConfig)
Expect(err).ToNot(HaveOccurred())
Expand Down
11 changes: 5 additions & 6 deletions k2s/test/e2e/cli/cmd/image/nosetup/corruptedstate/image_corrupted-state_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,11 @@ var _ = Describe("image", Ordered, func() {

BeforeEach(func() {
inputConfig := &setupinfo.Config{
SetupName: "k2s",
Registries: []string{"r1", "r2"},
LoggedInRegistry: "r2",
LinuxOnly: true,
Version: "test-version",
Corrupted: true,
SetupName: "k2s",
Registries: []string{"r1", "r2"},
LinuxOnly: true,
Version: "test-version",
Corrupted: true,
}
inputData, err := json.Marshal(inputConfig)
Expect(err).ToNot(HaveOccurred())
Expand Down
11 changes: 5 additions & 6 deletions k2s/test/e2e/cli/cmd/install/nosetup/corruptedstate/install_corrupted-state_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,11 @@ var _ = Describe("install", Ordered, func() {

BeforeEach(func() {
inputConfig := &setupinfo.Config{
SetupName: "k2s",
Registries: []string{"r1", "r2"},
LoggedInRegistry: "r2",
LinuxOnly: true,
Version: "test-version",
Corrupted: true,
SetupName: "k2s",
Registries: []string{"r1", "r2"},
LinuxOnly: true,
Version: "test-version",
Corrupted: true,
}
inputData, err := json.Marshal(inputConfig)
Expect(err).ToNot(HaveOccurred())
Expand Down
11 changes: 5 additions & 6 deletions k2s/test/e2e/cli/cmd/node/nosetup/corruptedstate/node_corrupted-state_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,11 @@ var _ = Describe("node", Ordered, func() {
// TODO: extract 'system-in-corrupted-state' to DSL for re-use
BeforeEach(func() {
inputConfig := &setupinfo.Config{
SetupName: "k2s",
Registries: []string{"r1", "r2"},
LoggedInRegistry: "r2",
LinuxOnly: true,
Version: "test-version",
Corrupted: true,
SetupName: "k2s",
Registries: []string{"r1", "r2"},
LinuxOnly: true,
Version: "test-version",
Corrupted: true,
}
inputData, err := json.Marshal(inputConfig)
Expect(err).ToNot(HaveOccurred())
Expand Down
11 changes: 5 additions & 6 deletions k2s/test/e2e/cli/cmd/start/nosetup/corruptedstate/start_corrupted-state_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,11 @@ var _ = Describe("start", Ordered, func() {

BeforeEach(func() {
inputConfig := &setupinfo.Config{
SetupName: "k2s",
Registries: []string{"r1", "r2"},
LoggedInRegistry: "r2",
LinuxOnly: true,
Version: "test-version",
Corrupted: true,
SetupName: "k2s",
Registries: []string{"r1", "r2"},
LinuxOnly: true,
Version: "test-version",
Corrupted: true,
}
inputData, err := json.Marshal(inputConfig)
Expect(err).ToNot(HaveOccurred())
Expand Down
11 changes: 5 additions & 6 deletions k2s/test/e2e/cli/cmd/status/nosetup/corruptedstate/status_corrupted-state_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,11 @@ var _ = Describe("status", Ordered, func() {

BeforeEach(func() {
inputConfig := &setupinfo.Config{
SetupName: "k2s",
Registries: []string{"r1", "r2"},
LoggedInRegistry: "r2",
LinuxOnly: true,
Version: "test-version",
Corrupted: true,
SetupName: "k2s",
Registries: []string{"r1", "r2"},
LinuxOnly: true,
Version: "test-version",
Corrupted: true,
}
inputData, err := json.Marshal(inputConfig)
Expect(err).ToNot(HaveOccurred())
Expand Down
11 changes: 5 additions & 6 deletions k2s/test/e2e/cli/cmd/stop/nosetup/corruptedstate/stop_corrupted-state_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,11 @@ var _ = Describe("stop", Ordered, func() {

BeforeEach(func() {
inputConfig := &setupinfo.Config{
SetupName: "k2s",
Registries: []string{"r1", "r2"},
LoggedInRegistry: "r2",
LinuxOnly: true,
Version: "test-version",
Corrupted: true,
SetupName: "k2s",
Registries: []string{"r1", "r2"},
LinuxOnly: true,
Version: "test-version",
Corrupted: true,
}
inputData, err := json.Marshal(inputConfig)
Expect(err).ToNot(HaveOccurred())
Expand Down
11 changes: 5 additions & 6 deletions k2s/test/e2e/cli/cmd/system/nosetup/corruptedstate/system_corrupted-state_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,11 @@ var _ = Describe("system", Ordered, func() {

BeforeEach(func() {
inputConfig := &setupinfo.Config{
SetupName: "k2s",
Registries: []string{"r1", "r2"},
LoggedInRegistry: "r2",
LinuxOnly: true,
Version: "test-version",
Corrupted: true,
SetupName: "k2s",
Registries: []string{"r1", "r2"},
LinuxOnly: true,
Version: "test-version",
Corrupted: true,
}
inputData, err := json.Marshal(inputConfig)
Expect(err).ToNot(HaveOccurred())
Expand Down

0 comments on commit 353577e

Please sign in to comment.