diff --git a/pkg/daemon/rpm-ostree.go b/pkg/daemon/rpm-ostree.go index f8601eefdf..78b61ceb37 100644 --- a/pkg/daemon/rpm-ostree.go +++ b/pkg/daemon/rpm-ostree.go @@ -14,7 +14,6 @@ import ( rpmostreeclient "github.com/coreos/rpmostree-client-go/pkg/client" "github.com/golang/glog" "github.com/opencontainers/go-digest" - "github.com/openshift/machine-config-operator/pkg/daemon/osrelease" pivotutils "github.com/openshift/machine-config-operator/pkg/daemon/pivot/utils" "gopkg.in/yaml.v2" ) @@ -356,27 +355,10 @@ func useKubeletConfigSecrets() error { return err } - runningos, err := osrelease.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