Skip to content

Commit cb47797

Browse files
build(e2e): Remove Kind DNS resolver override
This is no longer necessary to run E2E tests
1 parent abca6f1 commit cb47797

File tree

2 files changed

+0
-67
lines changed

2 files changed

+0
-67
lines changed

hack/kind/dns-override.yaml

Lines changed: 0 additions & 28 deletions
This file was deleted.

test/e2e/e2e_suite_test.go

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,16 @@ import (
1111
"encoding/base64"
1212
"encoding/gob"
1313
"flag"
14-
"fmt"
1514
"os"
1615
"path/filepath"
1716
"slices"
1817
"strings"
1918
"testing"
20-
"time"
2119

2220
. "github.com/onsi/ginkgo/v2"
2321
. "github.com/onsi/gomega"
24-
corev1 "k8s.io/api/core/v1"
2522
storagev1 "k8s.io/api/storage/v1"
26-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2723
"k8s.io/apimachinery/pkg/runtime"
28-
"k8s.io/apimachinery/pkg/types"
29-
"k8s.io/apimachinery/pkg/util/yaml"
3024
"k8s.io/klog/v2"
3125
capie2e "sigs.k8s.io/cluster-api/test/e2e"
3226
capie2eframework "sigs.k8s.io/cluster-api/test/framework"
@@ -116,39 +110,6 @@ var _ = SynchronizedBeforeSuite(func() []byte {
116110
useExistingCluster,
117111
)
118112

119-
By("Overriding coreDNS resolver")
120-
// override coredns resolver to 8.8.8.8 and restart coredns deployment
121-
// read the dns-override.yaml file
122-
filePath, _ := filepath.Abs("../../hack/kind/dns-override.yaml")
123-
yamlFile, err := os.ReadFile(filePath)
124-
Expect(err).To(BeNil(), "Failed to read the dns-override.yaml file")
125-
126-
// decode the yaml file into a Kubernetes object
127-
decode := yaml.NewYAMLOrJSONDecoder(bytes.NewReader(yamlFile), 4096)
128-
configMap := &corev1.ConfigMap{}
129-
err = decode.Decode(&configMap)
130-
Expect(err).To(BeNil(), "Failed to decode the yaml file into a Kubernetes object")
131-
132-
_, err = bootstrapClusterProxy.GetClientSet().
133-
CoreV1().
134-
ConfigMaps(configMap.GetNamespace()).
135-
Update(context.Background(), configMap, metav1.UpdateOptions{})
136-
Expect(
137-
err,
138-
).To(BeNil(), "Failed to update the coredns deployment with the dns-override.yaml file")
139-
140-
timeNow := time.Now().Format(time.RFC3339)
141-
patch := fmt.Sprintf(
142-
`{"spec":{"template":{"metadata":{"annotations":{"kubectl.kubernetes.io/restartedAt":%q}}}}}`,
143-
timeNow,
144-
)
145-
146-
_, err = bootstrapClusterProxy.GetClientSet().
147-
AppsV1().
148-
Deployments("kube-system").
149-
Patch(context.Background(), "coredns", types.StrategicMergePatchType, []byte(patch), metav1.PatchOptions{})
150-
Expect(err).To(BeNil(), "Failed to restart the coredns deployment")
151-
152113
By("Initializing the bootstrap cluster")
153114
initBootstrapCluster(bootstrapClusterProxy, e2eConfig, clusterctlConfigPath, artifactFolder)
154115

0 commit comments

Comments
 (0)