Skip to content

Commit

Permalink
allow for one to install jobset in a different namespace (#751)
Browse files Browse the repository at this point in the history
  • Loading branch information
kannon92 authored Jan 14, 2025
1 parent 6336081 commit 8d85dac
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func main() {
}

certsReady := make(chan struct{})
if err = cert.CertsManager(mgr, certsReady); err != nil {
if err = cert.CertsManager(mgr, cfg, certsReady); err != nil {
setupLog.Error(err, "unable to setup cert rotation")
os.Exit(1)
}
Expand Down
16 changes: 7 additions & 9 deletions pkg/util/cert/cert.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,32 +19,30 @@ import (
cert "github.com/open-policy-agent/cert-controller/pkg/rotator"
"k8s.io/apimachinery/pkg/types"
ctrl "sigs.k8s.io/controller-runtime"

config "sigs.k8s.io/jobset/api/config/v1alpha1"
)

const (
serviceName = "jobset-webhook-service"
secretName = "jobset-webhook-server-cert"
secretNamespace = "jobset-system"
certDir = "/tmp/k8s-webhook-server/serving-certs"
validateWebhookConfName = "jobset-validating-webhook-configuration"
mutatingWebhookConfName = "jobset-mutating-webhook-configuration"
caName = "jobset-ca"
caOrg = "jobset"
)

// dnsName is the format of <service name>.<namespace>.svc
var dnsName = fmt.Sprintf("%s.%s.svc", serviceName, secretNamespace)

//+kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;update
//+kubebuilder:rbac:groups="admissionregistration.k8s.io",resources=mutatingwebhookconfigurations,verbs=get;list;watch;update
//+kubebuilder:rbac:groups="admissionregistration.k8s.io",resources=validatingwebhookconfigurations,verbs=get;list;watch;update

// CertsManager creates certs for webhooks.
func CertsManager(mgr ctrl.Manager, setupFinish chan struct{}) error {
func CertsManager(mgr ctrl.Manager, cfg config.Configuration, setupFinish chan struct{}) error {
// DNSName is <service name>.<namespace>.svc
var dnsName = fmt.Sprintf("%s.%s.svc", *cfg.InternalCertManagement.WebhookServiceName, *cfg.Namespace)
return cert.AddRotator(mgr, &cert.CertRotator{
SecretKey: types.NamespacedName{
Namespace: secretNamespace,
Name: secretName,
Namespace: *cfg.Namespace,
Name: *cfg.InternalCertManagement.WebhookSecretName,
},
CertDir: certDir,
CAName: caName,
Expand Down

0 comments on commit 8d85dac

Please sign in to comment.