Revert using type meta fields to check owner ref

openshift · Jan 31, 2020 · 5395f2b · 5395f2b
1 parent 13b5462
commit 5395f2b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pkg/serviceaccounts/controllers/create_dockercfg_secrets.go b/pkg/serviceaccounts/controllers/create_dockercfg_secrets.go
@@ -503,8 +503,8 @@ func (e *DockercfgController) createDockerPullSecret(serviceAccount *v1.ServiceA
 	dockercfgSecret.Data[v1.DockerConfigKey] = dockercfgContent
 	dockercfgSecret.SetOwnerReferences([]metav1.OwnerReference{
 		{
-			Kind:       tokenSecret.Kind,
-			APIVersion: tokenSecret.APIVersion,
+			Kind:       "Secret",
+			APIVersion: "v1",
 			Name:       tokenSecret.Name,
 			UID:        tokenSecret.UID,
 		},
@@ -573,8 +573,8 @@ func (e *DockercfgController) syncDockercfgOwner(pullSecret *v1.Secret) error {
 	pullSecret = pullSecret.DeepCopy()
 	pullSecret.SetOwnerReferences([]metav1.OwnerReference{
 		{
-			Kind:       tokenSecretObj.Kind,
-			APIVersion: tokenSecretObj.APIVersion,
+			Kind:       "Secret",
+			APIVersion: "v1",
 			Name:       tokenSecretObj.Name,
 			UID:        tokenSecretObj.UID,
 		},

diff --git a/pkg/serviceaccounts/controllers/pull_secrets.go b/pkg/serviceaccounts/controllers/pull_secrets.go
@@ -31,8 +31,8 @@ func findDockercfgSecrets(client kubernetes.Interface, tokenSecret *corev1.Secre
 // hasOwnerReference checks if the given tokenSecret is the owner of the provided pullSecret
 func hasOwnerReference(tokenSecret, pullSecret *v1.Secret) bool {
 	for _, owner := range pullSecret.OwnerReferences {
-		if owner.Kind == tokenSecret.Kind &&
-			owner.APIVersion == tokenSecret.APIVersion &&
+		if owner.Kind == "Secret" &&
+			owner.APIVersion == "v1" &&
 			owner.Name == tokenSecret.Name &&
 			owner.UID == tokenSecret.UID {
 			return true