From f1c8aec816f88ac0435c3c8985bc49823fb9d20a Mon Sep 17 00:00:00 2001 From: Enrique Llorente Pastora Date: Mon, 24 Aug 2020 16:22:01 +0200 Subject: [PATCH] Use golang template variables for cert rotation knobs (#592) It will easy the operator implementation and the CNAO knmstate bump. Signed-off-by: Quique Llorente --- deploy/handler/operator.yaml | 6 +++--- pkg/controller/nmstate/nmstate_controller.go | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/deploy/handler/operator.yaml b/deploy/handler/operator.yaml index eb24d476a9..1bff3605e8 100644 --- a/deploy/handler/operator.yaml +++ b/deploy/handler/operator.yaml @@ -59,11 +59,11 @@ spec: - name: PROFILER_PORT value: "6060" - name: CA_ROTATE_INTERVAL - value: "8760h0m0s" # One Year + value: {{ .CARotateInterval | default "8760h0m0s" }} - name: CA_OVERLAP_INTERVAL - value: "8760h0m0s" # One Year + value: {{ .CAOverlapInterval | default "8760h0m0s" }} - name: CERT_ROTATE_INTERVAL - value: "4380h0m0s" # Half Year + value: {{ .CertRotateInterval | default "4380h0m0s" }} ports: - containerPort: 8443 name: webhook-server diff --git a/pkg/controller/nmstate/nmstate_controller.go b/pkg/controller/nmstate/nmstate_controller.go index c2516987a4..982fd2c753 100644 --- a/pkg/controller/nmstate/nmstate_controller.go +++ b/pkg/controller/nmstate/nmstate_controller.go @@ -150,6 +150,11 @@ func (r *ReconcileNMState) applyHandler(instance *nmstatev1beta1.NMState) error data.Data["HandlerPullPolicy"] = os.Getenv("HANDLER_IMAGE_PULL_POLICY") data.Data["HandlerPrefix"] = os.Getenv("HANDLER_PREFIX") data.Data["HandlerNodeSelector"] = instance.Spec.NodeSelector + // TODO: This is just a place holder to make template renderer happy + // proper variable has to be read from env or CR + data.Data["CARotateInterval"] = "" + data.Data["CAOverlapInterval"] = "" + data.Data["CertRotateInterval"] = "" return r.renderAndApply(instance, data, "handler", true) }