Skip to content

ROX-33584: Migrate cert monitor to controller-runtime #2624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kovayur merged 2 commits into from
Mar 16, 2026
Merged

ROX-33584: Migrate cert monitor to controller-runtime #2624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5047c8c
ROX-33584: Migrate cert monitor to controller-runtime
kovayur Mar 12, 2026
132cea0
Add cert key test
kovayur Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 6 additions & 74 deletions fleetshard/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,8 @@ import (
"flag"
"os"
"os/signal"
"time"

"github.com/stackrox/acs-fleet-manager/fleetshard/pkg/central/reconciler"
"github.com/stackrox/acs-fleet-manager/internal/certmonitor"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/informers"

"github.com/golang/glog"
cfg "github.com/stackrox/acs-fleet-manager/fleetshard/config"
Expand Down Expand Up @@ -59,7 +55,11 @@ func main() {
glog.Infof("Image pull secret configured, will be injected into tenant namespaces.")
}
glog.Info("Creating k8s client...")
k8sClient := k8s.CreateClientOrDie()
restConfig, err := ctrl.GetConfig()
if err != nil {
glog.Fatalf("Failed to get k8s config: %v", err)
}
k8sClient := k8s.CreateClientWithConfigOrDie(restConfig)
ctrl.SetLogger(logger.NewKubeAPILogger())
glog.Info("Creating runtime...")
runtime, err := runtime.NewRuntime(ctx, config, k8sClient)
Expand All @@ -76,75 +76,7 @@ func main() {

glog.Info("Creating certMonitor")

tenantNamespaceSelector := certmonitor.SelectorConfig{
LabelSelector: &metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{
Key: reconciler.TenantIDLabelKey,
Operator: metav1.LabelSelectorOpExists,
},
{
Key: reconciler.ProbeLabelKey,
Operator: metav1.LabelSelectorOpDoesNotExist,
},
},
},
}
certmonitorConfig := &certmonitor.Config{
Monitors: []certmonitor.MonitorConfig{
{
Namespace: tenantNamespaceSelector,
Secret: certmonitor.SelectorConfig{ // pragma: allowlist secret
Name: "scanner-tls",
},
},
{
Namespace: tenantNamespaceSelector,
Secret: certmonitor.SelectorConfig{ // pragma: allowlist secret
Name: "central-tls",
},
},

{
Namespace: tenantNamespaceSelector,
Secret: certmonitor.SelectorConfig{ // pragma: allowlist secret
Name: "scanner-db-tls",
},
},

{
Namespace: tenantNamespaceSelector,
Secret: certmonitor.SelectorConfig{ // pragma: allowlist secret
Name: "scanner-v4-db-tls",
},
},

{
Namespace: tenantNamespaceSelector,
Secret: certmonitor.SelectorConfig{ // pragma: allowlist secret
Name: "scanner-v4-indexer-tls",
},
},
{
Namespace: tenantNamespaceSelector,
Secret: certmonitor.SelectorConfig{ // pragma: allowlist secret
Name: "scanner-v4-matcher-tls",
},
},
},
}

if errs := certmonitor.ValidateConfig(*certmonitorConfig); len(errs) > 0 {
glog.Fatalf("certmonitor validation error: %v", errs)
}

k8sInterface := k8s.CreateInterfaceOrDie()
informerFactory := informers.NewSharedInformerFactory(k8sInterface, time.Minute)
secretInformer := informerFactory.Core().V1().Secrets().Informer()
namespaceInformer := informerFactory.Core().V1().Namespaces().Informer()
namespaceLister := informerFactory.Core().V1().Namespaces().Lister()

monitor := certmonitor.NewCertMonitor(certmonitorConfig, informerFactory, secretInformer, namespaceInformer, namespaceLister)
monitor := certmonitor.NewCertMonitor(restConfig)
if err := monitor.Start(); err != nil {
glog.Fatalf("Error starting certmonitor: %v", err)
}
Expand Down
17 changes: 0 additions & 17 deletions fleetshard/pkg/k8s/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"github.com/stackrox/rox/operator/api/v1alpha1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down Expand Up @@ -75,19 +74,3 @@ func IsRoutesResourceEnabled(client ctrlClient.Client) (bool, error) {
}
return true, nil
}

// CreateInterfaceOrDie create new kubernetes interface or dies
func CreateInterfaceOrDie() kubernetes.Interface {

config, err := ctrl.GetConfig()
if err != nil {
glog.Fatal("failed to get k8s client config", err)
}

clientset, err := kubernetes.NewForConfig(config)
if err != nil {
glog.Fatal("error creating clientset: %s", err.Error())
}

return clientset
}
Loading
Loading