From 6f14b0c17d04f8ac2a811806431860cbc414b6a1 Mon Sep 17 00:00:00 2001
From: Vadim Rutkovsky <vrutkovs@redhat.com>
Date: Sat, 11 Mar 2023 10:23:23 +0100
Subject: [PATCH] Revert "daemon: Temporarily copy auth file with more open
 perms on FCOS"

This reverts commit 6ccdd574fad38fc7bc2de1e1913c9ade69ba6e55.
---
 pkg/daemon/rpm-ostree.go | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/pkg/daemon/rpm-ostree.go b/pkg/daemon/rpm-ostree.go
index a8cf381d06..05f3e450a8 100644
--- a/pkg/daemon/rpm-ostree.go
+++ b/pkg/daemon/rpm-ostree.go
@@ -367,27 +367,10 @@ func useKubeletConfigSecrets() error {
 				return err
 			}
 
-			runningos, err := GetHostRunningOS()
+			err = os.Symlink(kubeletAuthFile, "/run/ostree/auth.json")
 			if err != nil {
 				return err
 			}
-
-			// Short term workaround for https://issues.redhat.com/browse/OKD-63
-			if runningos.IsFCOS() || runningos.IsSCOS() {
-				contents, err := os.ReadFile(kubeletAuthFile)
-				if err != nil {
-					return err
-				}
-				// Note 0644 perms for now
-				if err := os.WriteFile("/run/ostree/auth.json", contents, 0o644); err != nil {
-					return err
-				}
-			} else {
-				err = os.Symlink(kubeletAuthFile, "/run/ostree/auth.json")
-				if err != nil {
-					return err
-				}
-			}
 		}
 	}
 	return nil