github/Reloader
1
0
Fork 0
mirror of https://github.com/stakater/Reloader.git synced 2026-02-14 18:09:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added check to see if CSI CRDs are installed before running controller

Browse Source
This commit is contained in:
Zanis
2025-01-19 23:46:29 +00:00
parent 75f9a23de3
commit 717291f173
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/pkg/cmd/reloader.go
View File

@@ -179,8 +179,14 @@ func startReloader(cmd *cobra.Command, args []string) {
var controllers []*controller.Controller
for k := range kube.ResourceMap {
if k == "secretproviderclasspodstatuses" && !options.EnableCSIIntegration {
continue
if k == "secretproviderclasspodstatuses" {
if !options.EnableCSIIntegration {
continue
}
if !kube.IsCSIInstalled {
logrus.Infof("Can't run CSI controller as CSI CRDs are not installed")
continue
}
}
if ignoredResourcesList.Contains(k) || (len(namespaceLabelSelector) == 0 && k == "namespaces") {

24
pkg/kube/client.go
View File

@@ -25,6 +25,8 @@ type Clients struct {
var (
// IsOpenshift is true if environment is Openshift, it is false if environment is Kubernetes
IsOpenshift = isOpenshift()
// IsCSIEnabled is true if environment has CSI provider installed, otherwise false
IsCSIInstalled = isCSIInstalled()
)
// GetClients returns a `Clients` object containing both openshift and kubernetes clients with an openshift identifier
@@ -52,9 +54,11 @@ func GetClients() Clients {
var csiClient *csiclient.Clientset
csiClient, err = GetCSIClient()
if err != nil {
logrus.Warnf("Unable to create CSI client error = %v", err)
if IsCSIInstalled {
csiClient, err = GetCSIClient()
if err != nil {
logrus.Warnf("Unable to create CSI client error = %v", err)
}
}
return Clients{
@@ -73,6 +77,20 @@ func GetArgoRolloutClient() (*argorollout.Clientset, error) {
return argorollout.NewForConfig(config)
}
func isCSIInstalled() bool {
client, err := GetKubernetesClient()
if err != nil {
logrus.Fatalf("Unable to create Kubernetes client error = %v", err)
}
_, err = client.RESTClient().Get().AbsPath("/apis/secrets-store.csi.x-k8s.io/v1").Do(context.TODO()).Raw()
if err == nil {
logrus.Info("CSI provider is installed")
return true
}
logrus.Info("CSI provider is not installed")
return false
}
func GetCSIClient() (*csiclient.Clientset, error) {
config, err := getConfig()
if err != nil {