From 7e4710e9b3d11ee2cec502d9dde734ba197d270b Mon Sep 17 00:00:00 2001
From: Sirajudeen <sirajudeen.yasin@gmail.com>
Date: Mon, 2 Aug 2021 13:58:19 +0000
Subject: [PATCH] update syntax for kustomize with recent uplift

* updated the syntax for enable plugins with recent uplift
  of kustomize version
* Had to uplift the airshipctl version as well

Change-Id: I0c637603013adc2594c39cbea7cc07f3937cf3ee
---
 .../airship-core/target/generator/secret-template.yaml | 10 +++++-----
 playbooks/get-vm-config.yaml                           |  4 ++--
 zuul.d/projects.yaml                                   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifests/type/airship-core/target/generator/secret-template.yaml b/manifests/type/airship-core/target/generator/secret-template.yaml
index d959a60d5..72b8d1c9d 100644
--- a/manifests/type/airship-core/target/generator/secret-template.yaml
+++ b/manifests/type/airship-core/target/generator/secret-template.yaml
@@ -32,8 +32,8 @@ template: |
     name: generated-secrets
     annotations:
       config.kubernetes.io/path: secrets.yaml
-  {{- $ephemeralClusterCa := genCAEx .ephemeralCluster.ca.subj .ephemeralCluster.ca.validity }}
-  {{- $ephemeralKubeconfigCert := genSignedCertEx .ephemeralCluster.kubeconfigCert.subj nil nil .ephemeralCluster.kubeconfigCert.validity $ephemeralClusterCa }}
+  {{- $ephemeralClusterCa := genCAEx .ephemeralCluster.ca.subj (int .ephemeralCluster.ca.validity) }}
+  {{- $ephemeralKubeconfigCert := genSignedCertEx .ephemeralCluster.kubeconfigCert.subj nil nil (int .ephemeralCluster.kubeconfigCert.validity) $ephemeralClusterCa }}
   ephemeralClusterCa:
     crt: {{ $ephemeralClusterCa.Cert|b64enc|quote }}
     key: {{ $ephemeralClusterCa.Key|b64enc|quote }}
@@ -41,8 +41,8 @@ template: |
     certificate-authority-data: {{ $ephemeralClusterCa.Cert|b64enc|quote }}
     client-certificate-data: {{ $ephemeralKubeconfigCert.Cert|b64enc|quote }}
     client-key-data: {{ $ephemeralKubeconfigCert.Key|b64enc|quote }}
-  {{- $targetClusterCa := genCAEx .targetCluster.ca.subj .targetCluster.ca.validity }}
-  {{- $targetKubeconfigCert := genSignedCertEx .targetCluster.kubeconfigCert.subj nil nil .targetCluster.kubeconfigCert.validity $targetClusterCa }}
+  {{- $targetClusterCa := genCAEx .targetCluster.ca.subj (int .targetCluster.ca.validity) }}
+  {{- $targetKubeconfigCert := genSignedCertEx .targetCluster.kubeconfigCert.subj nil nil (int .targetCluster.kubeconfigCert.validity) $targetClusterCa }}
   targetClusterCa:
     tls.crt: {{ $targetClusterCa.Cert|b64enc|quote }}
     tls.key: {{ $targetClusterCa.Key|b64enc|quote }}
@@ -54,7 +54,7 @@ template: |
     passwords:
       root: {{ 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:
     privateKey: {{ $sshKey.Private|quote }}
     publicKey: {{ $sshKey.Public|quote }}
diff --git a/playbooks/get-vm-config.yaml b/playbooks/get-vm-config.yaml
index d4f3833ec..9658af2a3 100644
--- a/playbooks/get-vm-config.yaml
+++ b/playbooks/get-vm-config.yaml
@@ -16,7 +16,7 @@
 - name: get BareMetalHost objects
   shell: |
     set -e
-    kustomize build --enable_alpha_plugins \
+    kustomize build --enable-alpha-plugins \
       {{ airship_config_manifest_directory }}/{{ airship_config_site_path }}/{{ path }} 2>/dev/null |
     kustomize cfg grep  "kind=BareMetalHost"
   register: bmh_command
@@ -32,7 +32,7 @@
 - name: get network configuration for BareMetalHost objects
   shell: |
     set -e
-    kustomize build --enable_alpha_plugins \
+    kustomize build --enable-alpha-plugins \
       {{ airship_config_manifest_directory }}/{{ airship_config_site_path }}/{{ path }} 2>/dev/null |
     kustomize cfg grep  "metadata.name={{ item.spec.networkData.name }}"
   register: netdata_command
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 8b3c82b40..cb5ed9558 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -14,7 +14,7 @@
     vars:
       # NOTE(drewwalters96): Set AIRSHIPCTL_REF to a commit SHA in order to pin
       # the cloned version of airshipctl to a known/compatible reference.
-      AIRSHIPCTL_REF: 7974e041c55631a18f845f1909ca8306aa5cd2d6
+      AIRSHIPCTL_REF: 38849e63d174a796d44d4480acbe83654a17c924
       sphinx_build_dir: docs/build
     check:
       jobs: