Skip to content

Commit a504b66

Browse files
committed
use println for debugging because the logs arent printing
1 parent 460fff6 commit a504b66

File tree

3 files changed

+33
-24
lines changed

3 files changed

+33
-24
lines changed

main.go

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
package main
22

33
import (
4-
"go.uber.org/zap"
54
"flag"
5+
"github.com/open-policy-agent/cert-controller/pkg/rotator"
6+
"go.uber.org/zap"
67
"k8s.io/apimachinery/pkg/api/meta"
8+
"k8s.io/apimachinery/pkg/runtime"
9+
"k8s.io/apimachinery/pkg/types"
10+
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
711
"k8s.io/client-go/rest"
812
"k8s.io/client-go/tools/clientcmd/api"
913
"os"
10-
"github.com/open-policy-agent/cert-controller/pkg/rotator"
11-
"k8s.io/apimachinery/pkg/types"
12-
"k8s.io/apimachinery/pkg/runtime"
13-
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
1414
ctrl "sigs.k8s.io/controller-runtime"
15-
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
15+
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
1616
"time"
1717
)
1818

19-
// TODO: make all defaults "" and map loop to blow up when value is ""
20-
// TODO: call flag parse to maybe fix arguments
2119
var (
2220
certDir = flag.String("cert-dir", "", "The directory where certs are stored")
2321
caName = flag.String("ca-name", "", "The name of the ca cert")
@@ -29,17 +27,16 @@ var (
2927
webhookName = flag.String("webhook-name", "", "Your webhook name")
3028
)
3129

32-
33-
var webhooks = []rotator.WebhookInfo{
34-
{
35-
Name: *webhookName,
36-
Type: rotator.Mutating, // Todo: allow selecting types
37-
},
38-
}
39-
4030
func main() {
4131
flag.Parse()
4232

33+
var webhooks = []rotator.WebhookInfo{
34+
{
35+
Name: *webhookName,
36+
Type: rotator.Mutating, // Todo: allow selecting types
37+
},
38+
}
39+
4340
// configure logging.
4441
logger, _ := zap.NewDevelopment()
4542

pkg/rotator/rotator.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -627,9 +627,11 @@ func (r *ReconcileWH) Reconcile(ctx context.Context, request reconcile.Request)
627627
}
628628

629629
// Ensure certs on webhooks
630+
fmt.Println("Starting cert injection")
630631
if err := r.ensureCerts(artifacts.CertPEM); err != nil {
631632
return reconcile.Result{}, err
632633
}
634+
fmt.Println("Finished cert injection")
633635

634636
// Set CAInjected if the reconciler has not exited early.
635637
r.wasCAInjected.Store(true)
@@ -658,25 +660,32 @@ func (r *ReconcileWH) ensureCerts(certPem []byte) error {
658660
updatedResource.SetGroupVersionKind(gvk)
659661
if err := r.cache.Get(r.ctx, types.NamespacedName{Name: webhook.Name}, updatedResource); err != nil {
660662
if k8sErrors.IsNotFound(err) {
663+
fmt.Println("Webhook not found. Unable to update certificate.", err)
661664
log.Error(err, "Webhook not found. Unable to update certificate.")
662665
continue
663666
}
664667
anyError = err
665668
log.Error(err, "Error getting webhook for certificate update.")
669+
fmt.Println("Error getting webhook for certificate update.", err)
670+
666671
continue
667672
}
668673
if !updatedResource.GetDeletionTimestamp().IsZero() {
674+
fmt.Println("Webhook is being deleted. Unable to update certificate")
669675
log.Info("Webhook is being deleted. Unable to update certificate")
670676
continue
671677
}
672678

673679
log.Info("Ensuring CA cert", "name", webhook.Name, "gvk", gvk)
674680
if err := injectCert(updatedResource, certPem, webhook.Type); err != nil {
681+
fmt.Println("Unable to inject cert to webhook.:", err)
675682
log.Error(err, "Unable to inject cert to webhook.")
676683
anyError = err
677684
continue
678685
}
679686
if err := r.writer.Update(r.ctx, updatedResource); err != nil {
687+
fmt.Println("Error updating webhook with certificate:", err)
688+
680689
log.Error(err, "Error updating webhook with certificate")
681690
anyError = err
682691
continue

test.yaml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ spec:
2727
readOnly: true
2828
- name: cert-controller
2929
args:
30-
- cert-dir=/certs
31-
- ca-name=foocaname
32-
- secret-name=vpa-admission-controller-secret
33-
- service-name=fooservice
34-
- ca-organization=fooorg
35-
- namespace=default
36-
- dns-name=foo.bar.svc
37-
- webhook-name=vpa-webhook-config
30+
- -cert-dir=/certs
31+
- -ca-name=foocaname
32+
- -secret-name=vpa-admission-controller-secret
33+
- -service-name=fooservice
34+
- -ca-organization=fooorg
35+
- -namespace=default
36+
- -dns-name=foo.bar.svc
37+
- -webhook-name=vpa-webhook-config
3838
imagePullPolicy: Never
3939
image: cert-controller
4040
volumes:
@@ -63,6 +63,7 @@ webhooks:
6363
operations: ["CREATE"]
6464
resources: ["pods"]
6565
clientConfig:
66+
caBundle: Cg==
6667
service:
6768
namespace: default
6869
name: vpa-webhook
@@ -83,3 +84,5 @@ metadata:
8384
namespace: default
8485
annotations:
8586
samson/server_side_apply: 'true'
87+
88+
# TODO: add clusterrole, clusterrolebinding, serviceaccount to read and update secrets and webhooks

0 commit comments

Comments
 (0)