env: create private cert issuer as part of new env
diff --git a/core/installer/values-tmpl/certificate-issuer-private.jsonschema b/core/installer/values-tmpl/certificate-issuer-private.jsonschema
index cb7e4dc..27f907e 100644
--- a/core/installer/values-tmpl/certificate-issuer-private.jsonschema
+++ b/core/installer/values-tmpl/certificate-issuer-private.jsonschema
@@ -1,7 +1,14 @@
{
"type": "object",
"properties": {
- "GandiAPIToken": { "type": "string" }
+ "APIConfigMap": {
+ "type": "object",
+ "properties": {
+ "Name": { "type": "string" },
+ "Namespace": { "type": "string" }
+ },
+ "additionalProperties": false
+ }
},
"additionalProperties": false
}
diff --git a/core/installer/values-tmpl/certificate-issuer-private.yaml b/core/installer/values-tmpl/certificate-issuer-private.yaml
index 09209d0..8654be5 100644
--- a/core/installer/values-tmpl/certificate-issuer-private.yaml
+++ b/core/installer/values-tmpl/certificate-issuer-private.yaml
@@ -16,9 +16,6 @@
namespace: {{ .Global.Id }}
interval: 1m0s
values:
- certManager:
- namespace: {{ .Global.PCloudEnvName }}-cert-manager
- gandiWebhookSecretReader: {{ .Global.PCloudEnvName }}-cert-manager-webhook-gandi
issuer:
name: {{ .Global.Id }}-private
server: https://acme-v02.api.letsencrypt.org/directory
@@ -26,3 +23,6 @@
domain: {{ .Global.PrivateDomain }}
contactEmail: {{ .Global.ContactEmail }}
gandiAPIToken: {{ .Values.GandiAPIToken }}
+ apiConfigMap:
+ name: {{ .Values.APIConfigMap.Name }}
+ namespace: {{ .Values.APIConfigMap.Namespace }}
diff --git a/core/installer/values-tmpl/certificate-issuer-public.yaml b/core/installer/values-tmpl/certificate-issuer-public.yaml
index 5755f0f..bcf0079 100644
--- a/core/installer/values-tmpl/certificate-issuer-public.yaml
+++ b/core/installer/values-tmpl/certificate-issuer-public.yaml
@@ -17,10 +17,6 @@
namespace: {{ .Global.Id }}
interval: 1m0s
values:
- pcloudInstanceId: {{ .Global.Id }}
- certManager:
- namespace: {{ .Global.PCloudEnvName }}-cert-manager
- gandiWebhookSecretReader: {{ .Global.PCloudEnvName }}-cert-manager-webhook-gandi
issuer:
name: {{ .Global.Id }}-public
server: https://acme-v02.api.letsencrypt.org/directory