Merge pull request #264 from sebrandon1/objectmeta_remove

openshift-merge-bot[bot] · web-flow · commit 5de771d27828 · 2025-04-30T07:36:51.000Z
Remove unnecessary .ObjectMeta
diff --git a/pkg/controller/istiocsr/deployments.go b/pkg/controller/istiocsr/deployments.go
@@ -134,7 +134,7 @@ func (r *Reconciler) updateImageInStatus(istiocsr *v1alpha1.IstioCSR, deployment
 }
 
 func updatePodTemplateLabels(deployment *appsv1.Deployment, resourceLabels map[string]string) {
-	deployment.Spec.Template.ObjectMeta.Labels = resourceLabels
+	deployment.Spec.Template.Labels = resourceLabels
 }
 
 func updateArgList(deployment *appsv1.Deployment, istiocsr *v1alpha1.IstioCSR) {
diff --git a/pkg/controller/istiocsr/test_utils.go b/pkg/controller/istiocsr/test_utils.go
@@ -174,7 +174,7 @@ func testDeployment() *appsv1.Deployment {
 	deployment := decodeDeploymentObjBytes(assets.MustAsset(deploymentAssetName))
 	deployment.SetNamespace(testIstioCSRNamespace)
 	deployment.SetLabels(controllerDefaultResourceLabels)
-	deployment.Spec.Template.ObjectMeta.Labels = controllerDefaultResourceLabels
+	deployment.Spec.Template.Labels = controllerDefaultResourceLabels
 	deployment.Spec.Template.Spec.Containers[0].Image = image
 	return deployment
 }
diff --git a/pkg/controller/istiocsr/utils.go b/pkg/controller/istiocsr/utils.go
@@ -270,7 +270,7 @@ func deploymentSpecModified(desired, fetched *appsv1.Deployment) bool {
 		return true
 	}
 
-	if !reflect.DeepEqual(desired.Spec.Template.ObjectMeta.Labels, fetched.Spec.Template.ObjectMeta.Labels) ||
+	if !reflect.DeepEqual(desired.Spec.Template.Labels, fetched.Spec.Template.Labels) ||
 		len(desired.Spec.Template.Spec.Containers) != len(fetched.Spec.Template.Spec.Containers) {
 		return true
 	}
diff --git a/test/e2e/certificates_test.go b/test/e2e/certificates_test.go
@@ -640,13 +640,13 @@ var _ = Describe("ACME Certificate", Ordered, func() {
 					}},
 				},
 			}
-			ingress, err := loader.KubeClient.NetworkingV1().Ingresses(ingress.ObjectMeta.Namespace).Create(ctx, ingress, metav1.CreateOptions{})
+			ingress, err := loader.KubeClient.NetworkingV1().Ingresses(ingress.Namespace).Create(ctx, ingress, metav1.CreateOptions{})
 			Expect(err).NotTo(HaveOccurred())
-			defer loader.KubeClient.NetworkingV1().Ingresses(ingress.ObjectMeta.Namespace).Delete(ctx, ingress.ObjectMeta.Name, metav1.DeleteOptions{})
+			defer loader.KubeClient.NetworkingV1().Ingresses(ingress.Namespace).Delete(ctx, ingress.Name, metav1.DeleteOptions{})
 
 			By("checking TLS certificate contents")
 			err = wait.PollUntilContextTimeout(context.TODO(), PollInterval, TestTimeout, true, func(context.Context) (bool, error) {
-				secret, err := loader.KubeClient.CoreV1().Secrets(ingress.ObjectMeta.Namespace).Get(ctx, secretName, metav1.GetOptions{})
+				secret, err := loader.KubeClient.CoreV1().Secrets(ingress.Namespace).Get(ctx, secretName, metav1.GetOptions{})
 				tlsConfig, isvalid := library.GetTLSConfig(secret)
 				if !isvalid {
 					return false, nil
diff --git a/test/library/utils.go b/test/library/utils.go
@@ -35,9 +35,9 @@ func (d DynamicResourceLoader) CreateTestingNS(namespacePrefix string, noSuffix
 	}
 
 	if noSuffix {
-		namespace.ObjectMeta.Name = namespacePrefix
+		namespace.Name = namespacePrefix
 	} else {
-		namespace.ObjectMeta.GenerateName = fmt.Sprintf("%v-", namespacePrefix)
+		namespace.GenerateName = fmt.Sprintf("%v-", namespacePrefix)
 	}
 
 	var got *corev1.Namespace

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ func (r Reconciler) updateImageInStatus(istiocsr v1alpha1.IstioCSR, deployment`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`func updatePodTemplateLabels(deployment *appsv1.Deployment, resourceLabels map[string]string) {`
`137`		`- deployment.Spec.Template.ObjectMeta.Labels = resourceLabels`
	`137`	`+ deployment.Spec.Template.Labels = resourceLabels`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`func updateArgList(deployment appsv1.Deployment, istiocsr v1alpha1.IstioCSR) {`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ func testDeployment() *appsv1.Deployment {`
`174`	`174`	`deployment := decodeDeploymentObjBytes(assets.MustAsset(deploymentAssetName))`
`175`	`175`	`deployment.SetNamespace(testIstioCSRNamespace)`
`176`	`176`	`deployment.SetLabels(controllerDefaultResourceLabels)`
`177`		`- deployment.Spec.Template.ObjectMeta.Labels = controllerDefaultResourceLabels`
	`177`	`+ deployment.Spec.Template.Labels = controllerDefaultResourceLabels`
`178`	`178`	`deployment.Spec.Template.Spec.Containers[0].Image = image`
`179`	`179`	`return deployment`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ func deploymentSpecModified(desired, fetched *appsv1.Deployment) bool {`
`270`	`270`	`return true`
`271`	`271`	`}`
`272`	`272`
`273`		`- if !reflect.DeepEqual(desired.Spec.Template.ObjectMeta.Labels, fetched.Spec.Template.ObjectMeta.Labels) \|\|`
	`273`	`+ if !reflect.DeepEqual(desired.Spec.Template.Labels, fetched.Spec.Template.Labels) \|\|`
`274`	`274`	`len(desired.Spec.Template.Spec.Containers) != len(fetched.Spec.Template.Spec.Containers) {`
`275`	`275`	`return true`
`276`	`276`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@ func (d DynamicResourceLoader) CreateTestingNS(namespacePrefix string, noSuffix`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`if noSuffix {`
`38`		`- namespace.ObjectMeta.Name = namespacePrefix`
	`38`	`+ namespace.Name = namespacePrefix`
`39`	`39`	`} else {`
`40`		`- namespace.ObjectMeta.GenerateName = fmt.Sprintf("%v-", namespacePrefix)`
	`40`	`+ namespace.GenerateName = fmt.Sprintf("%v-", namespacePrefix)`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`var got *corev1.Namespace`