diff --git a/deploy/sthome-webhook/Chart.yaml b/deploy/sthome-webhook/Chart.yaml index a430be6..80c0e2e 100644 --- a/deploy/sthome-webhook/Chart.yaml +++ b/deploy/sthome-webhook/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -appVersion: "v0.0.2" +appVersion: "v0.0.3" description: Cert-Manager webhook for sthome name: sthome-webhook -version: 0.0.2 +version: 0.0.3 diff --git a/deploy/sthome-webhook/templates/deployment.yaml b/deploy/sthome-webhook/templates/deployment.yaml index b505a12..66668fd 100644 --- a/deploy/sthome-webhook/templates/deployment.yaml +++ b/deploy/sthome-webhook/templates/deployment.yaml @@ -5,6 +5,9 @@ metadata: namespace: {{ .Release.Namespace | quote }} labels: app: {{ include "sthome-webhook.name" . }} + # app.kubernetes.io/component: webhook + # app.kubernetes.io/name: webhook + # app.kubernetes.io/version: {{ .Chart.AppVersion }} chart: {{ include "sthome-webhook.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} diff --git a/deploy/sthome-webhook/templates/pki.yaml b/deploy/sthome-webhook/templates/pki.yaml index 1c61fa5..2d75756 100644 --- a/deploy/sthome-webhook/templates/pki.yaml +++ b/deploy/sthome-webhook/templates/pki.yaml @@ -74,3 +74,4 @@ spec: - {{ include "sthome-webhook.fullname" . }} - {{ include "sthome-webhook.fullname" . }}.{{ .Release.Namespace }} - {{ include "sthome-webhook.fullname" . }}.{{ .Release.Namespace }}.svc + - {{ include "sthome-webhook.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local diff --git a/deploy/sthome-webhook/values.yaml b/deploy/sthome-webhook/values.yaml index 2dac830..3cabc21 100644 --- a/deploy/sthome-webhook/values.yaml +++ b/deploy/sthome-webhook/values.yaml @@ -12,7 +12,7 @@ labels: sthome-webhook certManager: namespace: ix-cert-manager - serviceAccountName: cert-manager-certmanager-webhook + serviceAccountName: cert-manager-certmanager #secrets: # apiID: @@ -30,11 +30,11 @@ clusterIssuer: image: repository: stuurmcp/cert-manager-webhook-sthome - tag: 0.0.2 + tag: 0.0.3 #pullPolicy should be IfNotPresent. Set to Always for testing purposes pullPolicy: IfNotPresent -imageCredentials: +imageCredentials: name: docker-registry-credentials nameOverride: "" diff --git a/sthome/shell.go b/sthome/shell.go index cfa715c..73dc4fd 100644 --- a/sthome/shell.go +++ b/sthome/shell.go @@ -3,10 +3,12 @@ package sthome import ( "os" "os/exec" + + "k8s.io/klog/v2" ) func Execute(script string, command []string) (bool, error) { - + klog.InfoS("CZ: Executing ", "Path", script, "Args", command) cmd := &exec.Cmd{ Path: script, Args: command, diff --git a/sthome/solver_local.go b/sthome/solver_local.go index 3a7be9a..79d66c4 100644 --- a/sthome/solver_local.go +++ b/sthome/solver_local.go @@ -21,7 +21,6 @@ const ( // To do so, it must implement the `github.com/cert-manager/cert-manager/pkg/acme/webhook.Solver` // interface. type LocalDNSProviderSolver struct { - //client kubernetes.Clientset client kubernetes.Interface } @@ -47,7 +46,7 @@ func (loc *LocalDNSProviderSolver) Present(ch *v1alpha1.ChallengeRequest) error return err } - klog.InfoS("Presenting challenge", "dnsName", ch.DNSName, "resolvedZone", ch.ResolvedZone, "resolvedFQDN", ch.ResolvedFQDN) + klog.InfoS("CZ: Presenting challenge", "dnsName", ch.DNSName, "resolvedZone", ch.ResolvedZone, "resolvedFQDN", ch.ResolvedFQDN) /* provider, cfg, err := loc.init(ch.Config, ch.ResourceNamespace) @@ -73,8 +72,8 @@ func (loc *LocalDNSProviderSolver) Present(ch *v1alpha1.ChallengeRequest) error } */ // TODO: do something more useful with the decoded configuration - klog.InfoS("Decoded configuration %v", cfg) - klog.InfoS("presenting record for %s (%s)\n", ch.ResolvedFQDN, domainName) + fmt.Printf("CZ: Decoded configuration %v", cfg) + klog.InfoS("CZ: presenting record for ", ch.DNSName, ch.ResolvedFQDN, "domain", domainName) // TODO: add code that sets a record in the DNS provider's console // shell command @@ -128,7 +127,7 @@ func (loc *LocalDNSProviderSolver) Initialize(kubeClientConfig *rest.Config, sto return fmt.Errorf("failed to get kubernetes client: %w", err) } loc.client = cl - klog.InfoS("Successfully initialised kubernetes client!") + klog.InfoS("CZ: Successfully initialised kubernetes client!") return nil }