Rebase with main

Author: Karthik-K-N

api/bootstrap/kubeadm/v1beta1/zz_generated.conversion.go

@@ -193,37 +193,14 @@ func TestMatchClusterConfiguration(t *testing.T) {
 		g.Expect(err).ToNot(HaveOccurred())
 		g.Expect(match).To(BeFalse())
 		g.Expect(diff).To(BeComparableTo(`&v1beta2.ClusterConfiguration{
-<<<<<<< HEAD
     ... // 4 identical fields
     Scheduler:       {},
     DNS:             {},
 -   CertificatesDir: "bar",
 +   CertificatesDir: "foo",
     ImageRepository: "",
     FeatureGates:    nil,
-<<<<<<< HEAD
-=======
-    ... // 3 identical fields
-<<<<<<< HEAD
-    Scheduler:                        {},
-    DNS:                              {},
--   CertificatesDir:                  "bar",
-+   CertificatesDir:                  "foo",
-    ImageRepository:                  "",
-    FeatureGates:                     nil,
-    CertificateValidityPeriodSeconds: nil,
->>>>>>> f7f9d4ad3 (Add CertificateValidityPeriod type to KubeadmConfig)
-=======
-    Scheduler:       {},
-    DNS:             {},
--   CertificatesDir: "bar",
-+   CertificatesDir: "foo",
-    ImageRepository: "",
-    FeatureGates:    nil,
->>>>>>> 930fc1fd7 (Add CACertificateValidityPeriod to Kubeadmconfig)
-=======
     ... // 2 identical fields
->>>>>>> d9fdd9291 (Address reveiw comments)
   }`))
 	})
 	t.Run("Return true if only omittable fields are changed", func(t *testing.T) {
@@ -1023,11 +1000,7 @@ func TestMatchesKubeadmBootstrapConfig(t *testing.T) {
 		g.Expect(err).ToNot(HaveOccurred())
 		g.Expect(match).To(BeFalse())
 		g.Expect(reason).To(BeComparableTo(`Machine KubeadmConfig ClusterConfiguration is outdated: diff: &v1beta2.ClusterConfiguration{
-<<<<<<< HEAD
     ... // 4 identical fields
-=======
-    ... // 3 identical fields
->>>>>>> 930fc1fd7 (Add CACertificateValidityPeriod to Kubeadmconfig)
     Scheduler:       {},
     DNS:             {},
 -   CertificatesDir: "bar",
@@ -1835,7 +1808,7 @@ func TestUpToDate(t *testing.T) {
 			infraConfigs:            defaultInfraConfigs,
 			machineConfigs:          defaultMachineConfigs,
 			expectUptoDate:          false,
-			expectLogMessages:       []string{"Machine KubeadmConfig ClusterConfiguration is outdated: diff: &v1beta2.ClusterConfiguration{\n    ... // 4 identical fields\n    Scheduler:       {},\n    DNS:             {},\n-   CertificatesDir: \"foo\",\n+   CertificatesDir: \"bar\",\n    ImageRepository: \"\",\n    FeatureGates:    nil,\n  }"},
+			expectLogMessages:       []string{"Machine KubeadmConfig ClusterConfiguration is outdated: diff: &v1beta2.ClusterConfiguration{\n    ... // 4 identical fields\n    Scheduler:       {},\n    DNS:             {},\n-   CertificatesDir: \"foo\",\n+   CertificatesDir: \"bar\",\n    ImageRepository: \"\",\n    FeatureGates:    nil,\n    ... // 2 identical fields\n  }"},
 			expectConditionMessages: []string{"KubeadmConfig is not up-to-date"},
 		},
 		{