Fixes for patches

kubernetes-sigs · Sep 27, 2022 · 342dd42 · 342dd42
1 parent 55a78fa
commit 342dd42
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/api/v1beta1/awscluster_conversion.go b/api/v1beta1/awscluster_conversion.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 The Kubernetes Authors.
+Copyright 2021 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/api/v1beta1/awsidentity_conversion.go b/api/v1beta1/awsidentity_conversion.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 The Kubernetes Authors.
+Copyright 2021 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/api/v1beta1/awsmachine_conversion.go b/api/v1beta1/awsmachine_conversion.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 The Kubernetes Authors.
+Copyright 2021 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/e2e/data/e2e_conf.yaml b/test/e2e/data/e2e_conf.yaml
@@ -122,6 +122,7 @@ providers:
           - sourcePath: "./infrastructure-aws/generated/cluster-template-nested-multitenancy-clusterclass.yaml"
           - sourcePath: "./infrastructure-aws/kustomize_sources/nested-multitenancy-clusterclass/clusterclass-multi-tenancy.yaml"
           - sourcePath: "./infrastructure-aws/generated/cluster-template-self-hosted-clusterclass.yaml"
+          - sourcePath: "./infrastructure-aws/generated/cluster-template-external-vpc-clusterclass.yaml"
           - sourcePath: "./shared/v1beta2_provider/metadata.yaml"
           - sourcePath: "./infrastructure-aws/generated/cluster-template-ignition.yaml"
         replacements:

diff --git a/...a/infrastructure-aws/kustomize_sources/external-vpc-clusterclass/byo-infra-variables.yaml b/...a/infrastructure-aws/kustomize_sources/external-vpc-clusterclass/byo-infra-variables.yaml
@@ -23,3 +23,6 @@
   value:
     name: fdForBYOSubnets
     value: "us-west-2a"
+- op: replace
+  path: /spec/topology/workers/machineDeployments/0/failureDomain
+  value: "us-west-2a"
diff --git a/test/e2e/data/infrastructure-aws/kustomize_sources/topology/clusterclass-ci-default.yaml b/test/e2e/data/infrastructure-aws/kustomize_sources/topology/clusterclass-ci-default.yaml
@@ -258,13 +258,11 @@ spec:
             valueFrom:
               variable: vpcID
           - op: add
-            path: "/spec/template/spec/network/subnets/0/id"
+            path: /spec/template/spec/network/subnets
             valueFrom:
-              variable: publicSubnetID
-          - op: add
-            path: "/spec/template/spec/network/subnets/1/id"
-            valueFrom:
-              variable: privateSubnetID
+              template: |
+                - id: "{{ .publicSubnetID }}"
+                - id: "{{ .privateSubnetID }}"
   - name: awsMachineTemplateControlPlaneForBYO
     enabledIf: '{{ eq .byoInfra "true" }}'
     definitions:
@@ -274,7 +272,7 @@ spec:
           matchResources:
             controlPlane: true
         jsonPatches:
-          - op: replace
+          - op: add
             path: "/spec/template/spec/failureDomain"
             valueFrom:
               variable: fdForBYOSubnets
@@ -289,7 +287,7 @@ spec:
               names:
                 - default-worker
         jsonPatches:
-          - op: replace
+          - op: add
             path: "/spec/template/spec/failureDomain"
             valueFrom:
               variable: fdForBYOSubnets

diff --git a/test/e2e/suites/unmanaged/unmanaged_functional_clusterclass_test.go b/test/e2e/suites/unmanaged/unmanaged_functional_clusterclass_test.go
@@ -128,7 +128,7 @@ var _ = ginkgo.Context("[unmanaged] [functional] [ClusterClass]", func() {
 
 	// This test creates a workload cluster using an externally managed VPC and subnets. CAPA is still handling security group
 	// creation for the cluster. All applicable resources are restricted to us-west-2a for simplicity.
-	ginkgo.Describe("Workload cluster with external infrastructure", func() {
+	ginkgo.Describe("Workload cluster with external infrastructure [ClusterClass]", func() {
 		var namespace *corev1.Namespace
 		var requiredResources *shared.TestResource
 		specName := "functional-test-extinfra-clusterclass"