@@ -19,32 +19,30 @@ import (
1919 cert "github.com/open-policy-agent/cert-controller/pkg/rotator"
2020 "k8s.io/apimachinery/pkg/types"
2121 ctrl "sigs.k8s.io/controller-runtime"
22+
23+ config "sigs.k8s.io/jobset/api/config/v1alpha1"
2224)
2325
2426const (
25- serviceName = "jobset-webhook-service"
26- secretName = "jobset-webhook-server-cert"
27- secretNamespace = "jobset-system"
2827 certDir = "/tmp/k8s-webhook-server/serving-certs"
2928 validateWebhookConfName = "jobset-validating-webhook-configuration"
3029 mutatingWebhookConfName = "jobset-mutating-webhook-configuration"
3130 caName = "jobset-ca"
3231 caOrg = "jobset"
3332)
3433
35- // dnsName is the format of <service name>.<namespace>.svc
36- var dnsName = fmt .Sprintf ("%s.%s.svc" , serviceName , secretNamespace )
37-
3834//+kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;update
3935//+kubebuilder:rbac:groups="admissionregistration.k8s.io",resources=mutatingwebhookconfigurations,verbs=get;list;watch;update
4036//+kubebuilder:rbac:groups="admissionregistration.k8s.io",resources=validatingwebhookconfigurations,verbs=get;list;watch;update
4137
4238// CertsManager creates certs for webhooks.
43- func CertsManager (mgr ctrl.Manager , setupFinish chan struct {}) error {
39+ func CertsManager (mgr ctrl.Manager , cfg config.Configuration , setupFinish chan struct {}) error {
40+ // DNSName is <service name>.<namespace>.svc
41+ var dnsName = fmt .Sprintf ("%s.%s.svc" , * cfg .InternalCertManagement .WebhookServiceName , * cfg .Namespace )
4442 return cert .AddRotator (mgr , & cert.CertRotator {
4543 SecretKey : types.NamespacedName {
46- Namespace : secretNamespace ,
47- Name : secretName ,
44+ Namespace : * cfg . Namespace ,
45+ Name : * cfg . InternalCertManagement . WebhookSecretName ,
4846 },
4947 CertDir : certDir ,
5048 CAName : caName ,
0 commit comments