diff --git a/pkg/provider/apis/validation/validation.go b/pkg/provider/apis/validation/validation.go index 8106845f..3f2a8f6f 100644 --- a/pkg/provider/apis/validation/validation.go +++ b/pkg/provider/apis/validation/validation.go @@ -124,8 +124,10 @@ func ValidateProviderSpecNSecret(spec *api.ProviderSpec, secrets *corev1.Secret) } } - // Validate Networking - if spec.Networking != nil { + // Validate Networking (required) + if spec.Networking == nil { + errors = append(errors, fmt.Errorf("providerSpec.networking is required")) + } else { networkingErrors := validateNetworking(spec.Networking) errors = append(errors, networkingErrors...) } diff --git a/pkg/provider/apis/validation/validation_core_labels_test.go b/pkg/provider/apis/validation/validation_core_labels_test.go index eb5a926f..40d79607 100644 --- a/pkg/provider/apis/validation/validation_core_labels_test.go +++ b/pkg/provider/apis/validation/validation_core_labels_test.go @@ -20,6 +20,9 @@ var _ = Describe("ValidateProviderSpecNSecret", func() { MachineType: "c2i.2", ImageID: "550e8400-e29b-41d4-a716-446655440000", Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, } secret = &corev1.Secret{ Data: map[string][]byte{ @@ -72,8 +75,9 @@ var _ = Describe("ValidateProviderSpecNSecret", func() { It("should fail when both required fields are empty", func() { providerSpec.MachineType = "" providerSpec.ImageID = "" + providerSpec.Networking = nil errors := ValidateProviderSpecNSecret(providerSpec, secret) - Expect(errors).To(HaveLen(2)) + Expect(errors).To(HaveLen(3)) }) It("should succeed when Labels is nil", func() { diff --git a/pkg/provider/apis/validation/validation_fields_test.go b/pkg/provider/apis/validation/validation_fields_test.go index 4c3a1812..98c9157a 100644 --- a/pkg/provider/apis/validation/validation_fields_test.go +++ b/pkg/provider/apis/validation/validation_fields_test.go @@ -20,6 +20,9 @@ var _ = Describe("ValidateProviderSpecNSecret", func() { MachineType: "c2i.2", ImageID: "550e8400-e29b-41d4-a716-446655440000", Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, } secret = &corev1.Secret{ Data: map[string][]byte{ diff --git a/pkg/provider/apis/validation/validation_networking_test.go b/pkg/provider/apis/validation/validation_networking_test.go index fc7cf93c..f569a70f 100644 --- a/pkg/provider/apis/validation/validation_networking_test.go +++ b/pkg/provider/apis/validation/validation_networking_test.go @@ -49,10 +49,11 @@ var _ = Describe("ValidateProviderSpecNSecret", func() { Expect(errors).To(BeEmpty()) }) - It("should succeed when Networking is nil", func() { + It("should fail when Networking is nil", func() { providerSpec.Networking = nil errors := ValidateProviderSpecNSecret(providerSpec, secret) - Expect(errors).To(BeEmpty()) + Expect(errors).NotTo(BeEmpty()) + Expect(errors[0].Error()).To(ContainSubstring("networking is required")) }) It("should fail when Networking has neither NetworkID nor NICIDs", func() { diff --git a/pkg/provider/apis/validation/validation_secgroup_test.go b/pkg/provider/apis/validation/validation_secgroup_test.go index 89d97e83..eecbcd7c 100644 --- a/pkg/provider/apis/validation/validation_secgroup_test.go +++ b/pkg/provider/apis/validation/validation_secgroup_test.go @@ -20,6 +20,9 @@ var _ = Describe("ValidateProviderSpecNSecret", func() { MachineType: "c2i.2", ImageID: "550e8400-e29b-41d4-a716-446655440000", Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, } secret = &corev1.Secret{ Data: map[string][]byte{ diff --git a/pkg/provider/apis/validation/validation_secret_test.go b/pkg/provider/apis/validation/validation_secret_test.go index dc4dda88..6bbbf345 100644 --- a/pkg/provider/apis/validation/validation_secret_test.go +++ b/pkg/provider/apis/validation/validation_secret_test.go @@ -20,6 +20,9 @@ var _ = Describe("ValidateProviderSpecNSecret", func() { MachineType: "c2i.2", ImageID: "550e8400-e29b-41d4-a716-446655440000", Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, } secret = &corev1.Secret{ Data: map[string][]byte{ diff --git a/pkg/provider/apis/validation/validation_volumes_test.go b/pkg/provider/apis/validation/validation_volumes_test.go index 9c74f595..57c0995d 100644 --- a/pkg/provider/apis/validation/validation_volumes_test.go +++ b/pkg/provider/apis/validation/validation_volumes_test.go @@ -20,6 +20,9 @@ var _ = Describe("ValidateProviderSpecNSecret", func() { MachineType: "c2i.2", ImageID: "550e8400-e29b-41d4-a716-446655440000", Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, } secret = &corev1.Secret{ Data: map[string][]byte{ diff --git a/pkg/provider/create.go b/pkg/provider/create.go index c0578267..dabb81b7 100644 --- a/pkg/provider/create.go +++ b/pkg/provider/create.go @@ -90,7 +90,7 @@ func (p *Provider) CreateMachine(ctx context.Context, req *driver.CreateMachineR }, nil } -//nolint:gocyclo // TODO: will be fixed next PR +// nolint: gocyclo // this function is already pretty simple func (p *Provider) createServerRequest(req *driver.CreateMachineRequest, providerSpec *api.ProviderSpec) *client.CreateServerRequest { // Build labels: merge ProviderSpec labels with MCM-specific labels labels := make(map[string]string) @@ -114,19 +114,11 @@ func (p *Provider) createServerRequest(req *driver.CreateMachineRequest, provide } // Add networking configuration (required in v2 API) - // If not specified in ProviderSpec, try to use networkId from Secret, or use empty if providerSpec.Networking != nil { createReq.Networking = &client.ServerNetworkingRequest{ NetworkID: providerSpec.Networking.NetworkID, NICIDs: providerSpec.Networking.NICIDs, } - } else { - // v2 API requires networking field - use networkId from Secret if available - // This allows tests/deployments to specify a default network without modifying each MachineClass - networkID := string(req.Secret.Data["networkId"]) - createReq.Networking = &client.ServerNetworkingRequest{ - NetworkID: networkID, // Can be empty string if not in Secret - } } // Add security groups if specified diff --git a/pkg/provider/create_basic_test.go b/pkg/provider/create_basic_test.go index 952ad3f3..6fced3fe 100644 --- a/pkg/provider/create_basic_test.go +++ b/pkg/provider/create_basic_test.go @@ -36,12 +36,10 @@ var _ = Describe("CreateMachine", func() { client: mockClient, } - // Create secret with projectId and networkId (required for v2 API) secret = &corev1.Secret{ Data: map[string][]byte{ "project-id": []byte("11111111-2222-3333-4444-555555555555"), "serviceaccount.json": []byte(`{"credentials":{"iss":"test"}}`), - "networkId": []byte("770e8400-e29b-41d4-a716-446655440000"), }, } @@ -50,6 +48,9 @@ var _ = Describe("CreateMachine", func() { MachineType: "c2i.2", ImageID: "12345678-1234-1234-1234-123456789abc", Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, } providerSpecRaw, _ := mock.EncodeProviderSpec(providerSpec) diff --git a/pkg/provider/create_config_test.go b/pkg/provider/create_config_test.go index 686b37ac..61077231 100644 --- a/pkg/provider/create_config_test.go +++ b/pkg/provider/create_config_test.go @@ -33,12 +33,10 @@ var _ = Describe("CreateMachine", func() { client: mockClient, } - // Create secret with projectId and networkId (required for v2 API) secret = &corev1.Secret{ Data: map[string][]byte{ "project-id": []byte("11111111-2222-3333-4444-555555555555"), "serviceaccount.json": []byte(`{"credentials":{"iss":"test"}}`), - "networkId": []byte("770e8400-e29b-41d4-a716-446655440000"), }, } @@ -47,6 +45,9 @@ var _ = Describe("CreateMachine", func() { MachineType: "c2i.2", ImageID: "12345678-1234-1234-1234-123456789abc", Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, } providerSpecRaw, _ := mock.EncodeProviderSpec(providerSpec) @@ -82,6 +83,9 @@ var _ = Describe("CreateMachine", func() { providerSpec := &api.ProviderSpec{ MachineType: "c2i.2", Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, ImageID: "12345678-1234-1234-1234-123456789abc", KeypairName: "my-ssh-key", } @@ -127,9 +131,12 @@ var _ = Describe("CreateMachine", func() { Context("with availabilityZone", func() { It("should pass AvailabilityZone to API when specified", func() { providerSpec := &api.ProviderSpec{ - MachineType: "c2i.2", - ImageID: "12345678-1234-1234-1234-123456789abc", - Region: "eu01", + MachineType: "c2i.2", + ImageID: "12345678-1234-1234-1234-123456789abc", + Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, AvailabilityZone: "eu01-1", } providerSpecRaw, _ := mock.EncodeProviderSpec(providerSpec) @@ -174,8 +181,11 @@ var _ = Describe("CreateMachine", func() { Context("with affinityGroup", func() { It("should pass AffinityGroup to API when specified", func() { providerSpec := &api.ProviderSpec{ - MachineType: "c2i.2", - Region: "eu01", + MachineType: "c2i.2", + Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, ImageID: "12345678-1234-1234-1234-123456789abc", AffinityGroup: "880e8400-e29b-41d4-a716-446655440000", } @@ -221,7 +231,10 @@ var _ = Describe("CreateMachine", func() { providerSpec := &api.ProviderSpec{ MachineType: "c2i.2", Region: "eu01", - ImageID: "12345678-1234-1234-1234-123456789abc", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, + ImageID: "12345678-1234-1234-1234-123456789abc", ServiceAccountMails: []string{ "my-service@sa.stackit.cloud", }, @@ -272,6 +285,9 @@ var _ = Describe("CreateMachine", func() { MachineType: "c2i.2", ImageID: "12345678-1234-1234-1234-123456789abc", Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, Agent: &api.AgentSpec{ Provisioned: &provisioned, }, @@ -319,7 +335,10 @@ var _ = Describe("CreateMachine", func() { providerSpec := &api.ProviderSpec{ MachineType: "c2i.2", Region: "eu01", - ImageID: "12345678-1234-1234-1234-123456789abc", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, + ImageID: "12345678-1234-1234-1234-123456789abc", Metadata: map[string]interface{}{ "environment": "production", "cost-center": "12345", diff --git a/pkg/provider/create_networking_test.go b/pkg/provider/create_networking_test.go index ce886fb7..87be95b8 100644 --- a/pkg/provider/create_networking_test.go +++ b/pkg/provider/create_networking_test.go @@ -353,15 +353,12 @@ var _ = Describe("CreateMachine - Networking", func() { }) Context("with networking fallback to Secret", func() { - It("should use networkId from Secret when ProviderSpec.Networking is nil", func() { - // Add networkId to Secret - secret.Data["networkId"] = []byte("660e8400-e29b-41d4-a716-446655440000") - + It("should fail when ProviderSpec.Networking is nil", func() { providerSpec := &api.ProviderSpec{ MachineType: "c1.2", ImageID: "12345678-1234-1234-1234-123456789abc", Region: "eu01", - // Networking is nil - should fall back to Secret + // Networking is nil - should fail validation } providerSpecRaw, _ := mock.EncodeProviderSpec(providerSpec) @@ -381,73 +378,15 @@ var _ = Describe("CreateMachine - Networking", func() { Secret: secret, } - var capturedReq *client.CreateServerRequest - mockClient.CreateServerFunc = func(_ context.Context, _, _ string, req *client.CreateServerRequest) (*client.Server, error) { - capturedReq = req - return &client.Server{ - ID: "test-server-id", - Name: req.Name, - Status: "CREATING", - }, nil - } - _, err := provider.CreateMachine(ctx, req) - Expect(err).NotTo(HaveOccurred()) - Expect(capturedReq.Networking).NotTo(BeNil()) - Expect(capturedReq.Networking.NetworkID).To(Equal("660e8400-e29b-41d4-a716-446655440000")) - Expect(capturedReq.Networking.NICIDs).To(BeEmpty()) - }) - - It("should create empty networking when neither ProviderSpec nor Secret has networkId", func() { - providerSpec := &api.ProviderSpec{ - MachineType: "c1.2", - ImageID: "12345678-1234-1234-1234-123456789abc", - Region: "eu01", - // Networking is nil - } - providerSpecRaw, _ := mock.EncodeProviderSpec(providerSpec) - - machineClass = &v1alpha1.MachineClass{ - ObjectMeta: metav1.ObjectMeta{ - Name: "test-machine-class", - }, - Provider: "stackit", - ProviderSpec: runtime.RawExtension{ - Raw: providerSpecRaw, - }, - } - - req = &driver.CreateMachineRequest{ - Machine: machine, - MachineClass: machineClass, - Secret: secret, // No networkId in secret - } - - var capturedReq *client.CreateServerRequest - mockClient.CreateServerFunc = func(_ context.Context, _, _ string, req *client.CreateServerRequest) (*client.Server, error) { - capturedReq = req - return &client.Server{ - ID: "test-server-id", - Name: req.Name, - Status: "CREATING", - }, nil - } - - _, err := provider.CreateMachine(ctx, req) - - Expect(err).NotTo(HaveOccurred()) - Expect(capturedReq.Networking).NotTo(BeNil()) - Expect(capturedReq.Networking.NetworkID).To(BeEmpty()) - Expect(capturedReq.Networking.NICIDs).To(BeEmpty()) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("networking is required")) }) }) Context("with priority of networking configuration", func() { - It("should prioritize ProviderSpec.Networking over Secret.networkId", func() { - // Add networkId to Secret (should be ignored) - secret.Data["networkId"] = []byte("880e8400-e29b-41d4-a716-446655440001") - + It("should use ProviderSpec.Networking when specified", func() { providerSpec := &api.ProviderSpec{ MachineType: "c1.2", ImageID: "12345678-1234-1234-1234-123456789abc", @@ -489,13 +428,9 @@ var _ = Describe("CreateMachine - Networking", func() { Expect(err).NotTo(HaveOccurred()) Expect(capturedReq.Networking).NotTo(BeNil()) Expect(capturedReq.Networking.NetworkID).To(Equal("990e8400-e29b-41d4-a716-446655440002")) - Expect(capturedReq.Networking.NetworkID).NotTo(Equal("880e8400-e29b-41d4-a716-446655440001")) }) It("should reject empty networking in ProviderSpec (validation)", func() { - // Add networkId to Secret - secret.Data["networkId"] = []byte("880e8400-e29b-41d4-a716-446655440001") - providerSpec := &api.ProviderSpec{ MachineType: "c1.2", ImageID: "12345678-1234-1234-1234-123456789abc", diff --git a/pkg/provider/create_storage_test.go b/pkg/provider/create_storage_test.go index aae0dd3f..c774dce6 100644 --- a/pkg/provider/create_storage_test.go +++ b/pkg/provider/create_storage_test.go @@ -33,12 +33,10 @@ var _ = Describe("CreateMachine", func() { client: mockClient, } - // Create secret with projectId and networkId (required for v2 API) secret = &corev1.Secret{ Data: map[string][]byte{ "project-id": []byte("11111111-2222-3333-4444-555555555555"), "serviceaccount.json": []byte(`{"credentials":{"iss":"test"}}`), - "networkId": []byte("770e8400-e29b-41d4-a716-446655440000"), }, } @@ -47,6 +45,9 @@ var _ = Describe("CreateMachine", func() { MachineType: "c2i.2", ImageID: "12345678-1234-1234-1234-123456789abc", Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, } providerSpecRaw, _ := mock.EncodeProviderSpec(providerSpec) @@ -84,6 +85,9 @@ var _ = Describe("CreateMachine", func() { MachineType: "c2i.2", ImageID: "12345678-1234-1234-1234-123456789abc", Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, BootVolume: &api.BootVolumeSpec{ DeleteOnTermination: &deleteOnTermination, PerformanceClass: "premium", @@ -125,6 +129,9 @@ var _ = Describe("CreateMachine", func() { MachineType: "c2i.2", ImageID: "12345678-1234-1234-1234-123456789abc", Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, BootVolume: &api.BootVolumeSpec{ Size: 50, }, @@ -155,6 +162,9 @@ var _ = Describe("CreateMachine", func() { MachineType: "c2i.2", ImageID: "12345678-1234-1234-1234-123456789abc", Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, Volumes: []string{ "550e8400-e29b-41d4-a716-446655440000", "660e8400-e29b-41d4-a716-446655440001", @@ -188,6 +198,9 @@ var _ = Describe("CreateMachine", func() { MachineType: "c2i.2", ImageID: "12345678-1234-1234-1234-123456789abc", Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, BootVolume: &api.BootVolumeSpec{ Size: 50, }, diff --git a/pkg/provider/create_userdata_test.go b/pkg/provider/create_userdata_test.go index 5176ad65..8aa17704 100644 --- a/pkg/provider/create_userdata_test.go +++ b/pkg/provider/create_userdata_test.go @@ -34,12 +34,10 @@ var _ = Describe("CreateMachine", func() { client: mockClient, } - // Create secret with projectId and networkId (required for v2 API) secret = &corev1.Secret{ Data: map[string][]byte{ "project-id": []byte("11111111-2222-3333-4444-555555555555"), "serviceaccount.json": []byte(`{"credentials":{"iss":"test"}}`), - "networkId": []byte("770e8400-e29b-41d4-a716-446655440000"), }, } @@ -48,6 +46,9 @@ var _ = Describe("CreateMachine", func() { MachineType: "c2i.2", ImageID: "12345678-1234-1234-1234-123456789abc", Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, } providerSpecRaw, _ := mock.EncodeProviderSpec(providerSpec) @@ -85,6 +86,9 @@ var _ = Describe("CreateMachine", func() { ImageID: "12345678-1234-1234-1234-123456789abc", UserData: "#cloud-config\nruncmd:\n - echo 'Hello from ProviderSpec'", Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, } providerSpecRaw, _ := mock.EncodeProviderSpec(providerSpec) req.MachineClass.ProviderSpec.Raw = providerSpecRaw @@ -134,6 +138,9 @@ var _ = Describe("CreateMachine", func() { ImageID: "12345678-1234-1234-1234-123456789abc", UserData: "#cloud-config from ProviderSpec", Region: "eu01", + Networking: &api.NetworkingSpec{ + NetworkID: "770e8400-e29b-41d4-a716-446655440000", + }, } providerSpecRaw, _ := mock.EncodeProviderSpec(providerSpec) req.MachineClass.ProviderSpec.Raw = providerSpecRaw diff --git a/samples/machine-class.yaml b/samples/machine-class.yaml index 88277bd9..43b66049 100644 --- a/samples/machine-class.yaml +++ b/samples/machine-class.yaml @@ -130,8 +130,8 @@ providerSpec: # Volumes: attach existing volumes by UUID # These are data volumes in addition to the boot disk volumes: - - "880e8400-e29b-41d4-a716-446655440000" # data-volume-1 - - "990e8400-e29b-41d4-a716-446655440001" # data-volume-2 + - "880e8400-e29b-41d4-a716-446655440000" # data-volume-1 + - "990e8400-e29b-41d4-a716-446655440001" # data-volume-2 secretRef: name: test-secret namespace: default diff --git a/test/e2e/e2e_affinity_test.go b/test/e2e/e2e_affinity_test.go index ff9b0559..a8a47e6f 100644 --- a/test/e2e/e2e_affinity_test.go +++ b/test/e2e/e2e_affinity_test.go @@ -28,7 +28,6 @@ var _ = Describe("MCM Provider STACKIT", func() { projectId: "12345678-1234-1234-1234-123456789012" serviceAccountKey: "{}" region: "eu01-1" - networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: @@ -46,6 +45,8 @@ var _ = Describe("MCM Provider STACKIT", func() { providerSpec: machineType: "c2i.2" imageId: "550e8400-e29b-41d4-a716-446655440000" + networking: + networkId: "770e8400-e29b-41d4-a716-446655440000" affinityGroup: "880e8400-e29b-41d4-a716-446655440000" secretRef: name: %s diff --git a/test/e2e/e2e_agent_test.go b/test/e2e/e2e_agent_test.go index ae544c06..bbdd839e 100644 --- a/test/e2e/e2e_agent_test.go +++ b/test/e2e/e2e_agent_test.go @@ -28,7 +28,6 @@ stringData: projectId: "12345678-1234-1234-1234-123456789012" serviceAccountKey: "{}" region: "eu01-1" - networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: @@ -46,6 +45,8 @@ metadata: providerSpec: machineType: "c2i.2" imageId: "550e8400-e29b-41d4-a716-446655440000" + networking: + networkId: "770e8400-e29b-41d4-a716-446655440000" agent: provisioned: true secretRef: diff --git a/test/e2e/e2e_az_test.go b/test/e2e/e2e_az_test.go index 1eb7aeb9..3d503358 100644 --- a/test/e2e/e2e_az_test.go +++ b/test/e2e/e2e_az_test.go @@ -28,7 +28,6 @@ stringData: projectId: "12345678-1234-1234-1234-123456789012" serviceAccountKey: "{}" region: "eu01-1" - networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: @@ -47,6 +46,8 @@ providerSpec: machineType: "c2i.2" imageId: "550e8400-e29b-41d4-a716-446655440000" availabilityZone: "eu01-1" + networking: + networkId: "770e8400-e29b-41d4-a716-446655440000" secretRef: name: %s namespace: %s diff --git a/test/e2e/e2e_keypair_test.go b/test/e2e/e2e_keypair_test.go index 1e29f907..9e5db8e9 100644 --- a/test/e2e/e2e_keypair_test.go +++ b/test/e2e/e2e_keypair_test.go @@ -28,7 +28,6 @@ stringData: projectId: "12345678-1234-1234-1234-123456789012" serviceAccountKey: "{}" region: "eu01-1" - networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: @@ -46,6 +45,8 @@ metadata: providerSpec: machineType: "c2i.2" imageId: "550e8400-e29b-41d4-a716-446655440000" + networking: + networkId: "770e8400-e29b-41d4-a716-446655440000" keypairName: "my-test-keypair" secretRef: name: %s diff --git a/test/e2e/e2e_labels_test.go b/test/e2e/e2e_labels_test.go index a1d25e36..e0e13d1e 100644 --- a/test/e2e/e2e_labels_test.go +++ b/test/e2e/e2e_labels_test.go @@ -33,7 +33,6 @@ stringData: projectId: "12345678-1234-1234-1234-123456789012" serviceAccountKey: "{}" region: "eu01-1" - networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: @@ -52,6 +51,8 @@ metadata: providerSpec: machineType: "c2i.2" imageId: "550e8400-e29b-41d4-a716-446655440000" + networking: + networkId: "770e8400-e29b-41d4-a716-446655440000" labels: application: "web-server" team: "frontend" @@ -76,6 +77,8 @@ metadata: providerSpec: machineType: "c1.4" imageId: "550e8400-e29b-41d4-a716-446655440000" + networking: + networkId: "770e8400-e29b-41d4-a716-446655440000" labels: application: "database" team: "backend" @@ -213,7 +216,6 @@ stringData: projectId: "12345678-1234-1234-1234-123456789012" serviceAccountKey: "{}" region: "eu01-1" - networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: @@ -231,6 +233,8 @@ metadata: providerSpec: machineType: "c2i.2" imageId: "550e8400-e29b-41d4-a716-446655440000" + networking: + networkId: "770e8400-e29b-41d4-a716-446655440000" labels: test-propagation: "enabled" stack-component: "compute-worker" @@ -411,7 +415,6 @@ stringData: projectId: "12345678-1234-1234-1234-123456789012" serviceAccountKey: "{}" region: "eu01-1" - networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: @@ -429,6 +432,8 @@ metadata: providerSpec: machineType: "c2i.2" imageId: "550e8400-e29b-41d4-a716-446655440000" + networking: + networkId: "770e8400-e29b-41d4-a716-446655440000" # NO labels field - testing graceful handling of missing labels secretRef: name: %s diff --git a/test/e2e/e2e_lifecycle_test.go b/test/e2e/e2e_lifecycle_test.go index e3cab91c..b7ba36ec 100644 --- a/test/e2e/e2e_lifecycle_test.go +++ b/test/e2e/e2e_lifecycle_test.go @@ -28,7 +28,6 @@ stringData: projectId: "12345678-1234-1234-1234-123456789012" serviceAccountKey: "{}" region: "eu01-1" - networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: @@ -45,6 +44,8 @@ metadata: providerSpec: machineType: "c2i.2" imageId: "550e8400-e29b-41d4-a716-446655440000" + networking: + networkId: "770e8400-e29b-41d4-a716-446655440000" labels: application: "web-server" team: "platform" @@ -134,7 +135,6 @@ stringData: projectId: "12345678-1234-1234-1234-123456789012" serviceAccountKey: "{}" region: "eu01-1" - networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: @@ -151,6 +151,8 @@ metadata: providerSpec: machineType: "c2i.2" imageId: "550e8400-e29b-41d4-a716-446655440000" + networking: + networkId: "770e8400-e29b-41d4-a716-446655440000" labels: application: "database" team: "backend" @@ -230,7 +232,6 @@ stringData: projectId: "12345678-1234-1234-1234-123456789012" serviceAccountKey: "{}" region: "eu01-1" - networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: @@ -247,6 +248,8 @@ metadata: providerSpec: machineType: "c2i.2" imageId: "550e8400-e29b-41d4-a716-446655440000" + networking: + networkId: "770e8400-e29b-41d4-a716-446655440000" labels: application: "monitoring" team: "sre" diff --git a/test/e2e/e2e_metadata_test.go b/test/e2e/e2e_metadata_test.go index 1fe6623a..9dcaffb4 100644 --- a/test/e2e/e2e_metadata_test.go +++ b/test/e2e/e2e_metadata_test.go @@ -28,7 +28,6 @@ stringData: projectId: "12345678-1234-1234-1234-123456789012" serviceAccountKey: "{}" region: "eu01-1" - networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: @@ -46,6 +45,8 @@ metadata: providerSpec: machineType: "c2i.2" imageId: "550e8400-e29b-41d4-a716-446655440000" + networking: + networkId: "770e8400-e29b-41d4-a716-446655440000" metadata: environment: "production" cost-center: "12345" diff --git a/test/e2e/e2e_service_accounts_test.go b/test/e2e/e2e_service_accounts_test.go index e332b4c8..b45171c6 100644 --- a/test/e2e/e2e_service_accounts_test.go +++ b/test/e2e/e2e_service_accounts_test.go @@ -28,7 +28,6 @@ stringData: projectId: "12345678-1234-1234-1234-123456789012" serviceAccountKey: "{}" region: "eu01-1" - networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: @@ -47,6 +46,8 @@ metadata: providerSpec: machineType: "c2i.2" imageId: "550e8400-e29b-41d4-a716-446655440000" + networking: + networkId: "770e8400-e29b-41d4-a716-446655440000" serviceAccountMails: - "my-service@sa.stackit.cloud" secretRef: diff --git a/test/e2e/e2e_userdata_test.go b/test/e2e/e2e_userdata_test.go index 1f475411..b0649bab 100644 --- a/test/e2e/e2e_userdata_test.go +++ b/test/e2e/e2e_userdata_test.go @@ -30,7 +30,6 @@ stringData: projectId: "12345678-1234-1234-1234-123456789012" serviceAccountKey: "{}" region: "eu01-1" - networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: @@ -48,6 +47,8 @@ metadata: providerSpec: machineType: "c2i.2" imageId: "550e8400-e29b-41d4-a716-446655440000" + networking: + networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: @@ -176,7 +177,6 @@ stringData: projectId: "12345678-1234-1234-1234-123456789012" serviceAccountKey: "{}" region: "eu01-1" - networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: diff --git a/test/e2e/e2e_volumes_test.go b/test/e2e/e2e_volumes_test.go index 430228aa..ba81be7d 100644 --- a/test/e2e/e2e_volumes_test.go +++ b/test/e2e/e2e_volumes_test.go @@ -30,7 +30,6 @@ stringData: projectId: "12345678-1234-1234-1234-123456789012" serviceAccountKey: "{}" region: "eu01-1" - networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: @@ -48,6 +47,8 @@ metadata: providerSpec: machineType: "c2i.2" imageId: "550e8400-e29b-41d4-a716-446655440000" + networking: + networkId: "770e8400-e29b-41d4-a716-446655440000" bootVolume: size: 100 performanceClass: "premium" @@ -104,7 +105,6 @@ stringData: projectId: "12345678-1234-1234-1234-123456789012" serviceAccountKey: "{}" region: "eu01-1" - networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: @@ -122,6 +122,8 @@ metadata: providerSpec: machineType: "c2i.2" imageId: "550e8400-e29b-41d4-a716-446655440000" + networking: + networkId: "770e8400-e29b-41d4-a716-446655440000" volumes: - "550e8400-e29b-41d4-a716-446655440000" - "660e8400-e29b-41d4-a716-446655440001" @@ -178,7 +180,6 @@ stringData: projectId: "12345678-1234-1234-1234-123456789012" serviceAccountKey: "{}" region: "eu01-1" - networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: @@ -196,6 +197,8 @@ metadata: providerSpec: machineType: "c2i.2" imageId: "550e8400-e29b-41d4-a716-446655440000" + networking: + networkId: "770e8400-e29b-41d4-a716-446655440000" bootVolume: size: 50 performanceClass: "standard" @@ -254,7 +257,6 @@ stringData: projectId: "12345678-1234-1234-1234-123456789012" serviceAccountKey: "{}" region: "eu01-1" - networkId: "770e8400-e29b-41d4-a716-446655440000" userData: | #cloud-config runcmd: @@ -272,6 +274,8 @@ metadata: namespace: %s providerSpec: machineType: "c2i.2" + networking: + networkId: "770e8400-e29b-41d4-a716-446655440000" bootVolume: size: 80 performanceClass: "premium"