Merge "Aligning to the recent changes for airshipctl"
This commit is contained in:
commit
0690defe54
@ -32,8 +32,8 @@ template: |
|
|||||||
name: generated-secrets
|
name: generated-secrets
|
||||||
annotations:
|
annotations:
|
||||||
config.kubernetes.io/path: secrets.yaml
|
config.kubernetes.io/path: secrets.yaml
|
||||||
{{- $ephemeralClusterCa := genCAEx .ephemeralCluster.ca.subj .ephemeralCluster.ca.validity }}
|
{{- $ephemeralClusterCa := genCAEx .ephemeralCluster.ca.subj (int .ephemeralCluster.ca.validity) }}
|
||||||
{{- $ephemeralKubeconfigCert := genSignedCertEx .ephemeralCluster.kubeconfigCert.subj nil nil .ephemeralCluster.kubeconfigCert.validity $ephemeralClusterCa }}
|
{{- $ephemeralKubeconfigCert := genSignedCertEx .ephemeralCluster.kubeconfigCert.subj nil nil (int .ephemeralCluster.kubeconfigCert.validity) $ephemeralClusterCa }}
|
||||||
ephemeralClusterCa:
|
ephemeralClusterCa:
|
||||||
crt: {{ $ephemeralClusterCa.Cert|b64enc|quote }}
|
crt: {{ $ephemeralClusterCa.Cert|b64enc|quote }}
|
||||||
key: {{ $ephemeralClusterCa.Key|b64enc|quote }}
|
key: {{ $ephemeralClusterCa.Key|b64enc|quote }}
|
||||||
@ -41,8 +41,8 @@ template: |
|
|||||||
certificate-authority-data: {{ $ephemeralClusterCa.Cert|b64enc|quote }}
|
certificate-authority-data: {{ $ephemeralClusterCa.Cert|b64enc|quote }}
|
||||||
client-certificate-data: {{ $ephemeralKubeconfigCert.Cert|b64enc|quote }}
|
client-certificate-data: {{ $ephemeralKubeconfigCert.Cert|b64enc|quote }}
|
||||||
client-key-data: {{ $ephemeralKubeconfigCert.Key|b64enc|quote }}
|
client-key-data: {{ $ephemeralKubeconfigCert.Key|b64enc|quote }}
|
||||||
{{- $targetClusterCa := genCAEx .targetCluster.ca.subj .targetCluster.ca.validity }}
|
{{- $targetClusterCa := genCAEx .targetCluster.ca.subj (int .targetCluster.ca.validity) }}
|
||||||
{{- $targetKubeconfigCert := genSignedCertEx .targetCluster.kubeconfigCert.subj nil nil .targetCluster.kubeconfigCert.validity $targetClusterCa }}
|
{{- $targetKubeconfigCert := genSignedCertEx .targetCluster.kubeconfigCert.subj nil nil (int .targetCluster.kubeconfigCert.validity) $targetClusterCa }}
|
||||||
targetClusterCa:
|
targetClusterCa:
|
||||||
tls.crt: {{ $targetClusterCa.Cert|b64enc|quote }}
|
tls.crt: {{ $targetClusterCa.Cert|b64enc|quote }}
|
||||||
tls.key: {{ $targetClusterCa.Key|b64enc|quote }}
|
tls.key: {{ $targetClusterCa.Key|b64enc|quote }}
|
||||||
@ -54,7 +54,7 @@ template: |
|
|||||||
passwords:
|
passwords:
|
||||||
root: {{ derivePassword 1 "long" (randAscii 10) "user" "airshipit.org"|quote }}
|
root: {{ derivePassword 1 "long" (randAscii 10) "user" "airshipit.org"|quote }}
|
||||||
deployer: {{ derivePassword 1 "long" (randAscii 10) "user" "airshipit.org"|quote }}
|
deployer: {{ derivePassword 1 "long" (randAscii 10) "user" "airshipit.org"|quote }}
|
||||||
{{- $sshKey := genSSHKeyPair .sshKeyGen.encBit }}
|
{{- $sshKey := genSSHKeyPair (int .sshKeyGen.encBit) }}
|
||||||
sshKeys:
|
sshKeys:
|
||||||
privateKey: {{ $sshKey.Private|quote }}
|
privateKey: {{ $sshKey.Private|quote }}
|
||||||
publicKey: {{ $sshKey.Public|quote }}
|
publicKey: {{ $sshKey.Public|quote }}
|
||||||
|
Loading…
Reference in New Issue
Block a user