From dd0e89a887f17f407adf0c78951ec9b4a86478df Mon Sep 17 00:00:00 2001 From: Manjunath A Kumatagi Date: Fri, 13 May 2022 23:34:05 +0530 Subject: [PATCH] fix the ci error --- images/capi/packer/config/kubernetes.json | 6 +- .../packer/config/ppc64le/containerd.json | 4 +- images/capi/packer/powervs/centos-8.json | 6 +- images/capi/packer/powervs/packer.json | 60 +++++++++---------- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/images/capi/packer/config/kubernetes.json b/images/capi/packer/config/kubernetes.json index 7ffd2f6416..d801b17852 100644 --- a/images/capi/packer/config/kubernetes.json +++ b/images/capi/packer/config/kubernetes.json @@ -2,8 +2,8 @@ "crictl_arch": "amd64", "crictl_sha256": "sha256:https://github.com/kubernetes-sigs/cri-tools/releases/download/v{{user `crictl_version`}}/crictl-v{{user `crictl_version`}}-linux-{{user `crictl_arch`}}.tar.gz.sha256", "crictl_source_type": "pkg", - "crictl_version": "1.23.0", "crictl_url": "https://github.com/kubernetes-sigs/cri-tools/releases/download/v{{user `crictl_version`}}/crictl-v{{user `crictl_version`}}-linux-{{user `crictl_arch`}}.tar.gz", + "crictl_version": "1.23.0", "kubeadm_template": "etc/kubeadm.yml", "kubernetes_container_registry": "k8s.gcr.io", "kubernetes_deb_gpg_key": "https://packages.cloud.google.com/apt/doc/apt-key.gpg", @@ -13,11 +13,11 @@ "kubernetes_load_additional_imgs": "false", "kubernetes_rpm_gpg_check": "True", "kubernetes_rpm_gpg_key": "\"https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg\"", - "kubernetes_rpm_repo_arch": "x86_64", "kubernetes_rpm_repo": "https://packages.cloud.google.com/yum/repos/kubernetes-el7-{{user `kubernetes_rpm_repo_arch`}}", + "kubernetes_rpm_repo_arch": "x86_64", "kubernetes_rpm_version": "1.22.9-0", "kubernetes_semver": "v1.22.9", - "kubernetes_series": "v1.22, + "kubernetes_series": "v1.22", "kubernetes_source_type": "pkg", "systemd_prefix": "/usr/lib/systemd", "sysusr_prefix": "/usr", diff --git a/images/capi/packer/config/ppc64le/containerd.json b/images/capi/packer/config/ppc64le/containerd.json index 25e32ac337..2f011ef43f 100644 --- a/images/capi/packer/config/ppc64le/containerd.json +++ b/images/capi/packer/config/ppc64le/containerd.json @@ -1,5 +1,5 @@ { "containerd_sha256": "dc4301a4a24b747765efab925e9e8edaec4c09862fb4a51066bea0138562e103", - "containerd_version": "1.5.7", - "containerd_url": "https://oplab9.parqtec.unicamp.br/pub/ppc64el/containerd-cri/containerd-cri-{{user `containerd_version`}}/cri-containerd-cni-{{user `containerd_version`}}-linux-ppc64le.tar.gz" + "containerd_url": "https://oplab9.parqtec.unicamp.br/pub/ppc64el/containerd-cri/containerd-cri-{{user `containerd_version`}}/cri-containerd-cni-{{user `containerd_version`}}-linux-ppc64le.tar.gz", + "containerd_version": "1.5.7" } diff --git a/images/capi/packer/powervs/centos-8.json b/images/capi/packer/powervs/centos-8.json index af8c0dfeee..eb1c1a2953 100644 --- a/images/capi/packer/powervs/centos-8.json +++ b/images/capi/packer/powervs/centos-8.json @@ -1,9 +1,9 @@ { "build_name": "centos-streams8", - "ssh_username": "root", - "redhat_epel_rpm": "https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm", "epel_rpm_gpg_key": "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8", + "redhat_epel_rpm": "https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm", "source_cos_bucket": "power-oss-bucket", "source_cos_object": "centos-streams-8.ova.gz", - "source_cos_region": "us-south" + "source_cos_region": "us-south", + "ssh_username": "root" } diff --git a/images/capi/packer/powervs/packer.json b/images/capi/packer/powervs/packer.json index 51214d5b47..a5f2520d97 100644 --- a/images/capi/packer/powervs/packer.json +++ b/images/capi/packer/powervs/packer.json @@ -1,12 +1,21 @@ { - "builders":[ + "builders": [ { - "type": "powervs", - "api_key": "{{user `apikey`}}", "account_id": "{{user `account_id`}}", - "service_instance_id": "{{user `service_instance_id`}}", + "api_key": "{{user `apikey`}}", + "capture": { + "cos": { + "access_key": "{{user `capture_cos_access_key`}}", + "bucket": "{{user `capture_cos_bucket`}}", + "region": "{{user `capture_cos_region`}}", + "secret_key": "{{user `capture_cos_secret_key`}}" + }, + "name": "capibm-powervs-{{user `build_name`}}-{{user `kubernetes_rpm_version` | clean_resource_name}}-{{user `build_timestamp`}}" + }, + "instance_name": "capibm-{{user `build_name`}}-{{user `build_timestamp`}}", + "key_pair_name": "{{user `key_pair_name`}}", "region": "{{user `region`}}", - "zone": "{{user `zone`}}", + "service_instance_id": "{{user `service_instance_id`}}", "source": { "cos": { "bucket": "{{user `source_cos_bucket`}}", @@ -14,20 +23,11 @@ "region": "{{user `source_cos_region`}}" } }, - "instance_name": "capibm-{{user `build_name`}}-{{user `build_timestamp`}}", - "key_pair_name": "{{user `key_pair_name`}}", - "ssh_username": "{{user `ssh_username`}}", "ssh_private_key_file": "{{user `ssh_private_key_file`}}", "ssh_timeout": "{{user `ssh_timeout`}}", - "capture": { - "name": "capibm-powervs-{{user `build_name`}}-{{user `kubernetes_rpm_version` | clean_resource_name}}-{{user `build_timestamp`}}", - "cos": { - "bucket": "{{user `capture_cos_bucket`}}", - "region": "{{user `capture_cos_region`}}", - "access_key": "{{user `capture_cos_access_key`}}", - "secret_key": "{{user `capture_cos_secret_key`}}" - } - } + "ssh_username": "{{user `ssh_username`}}", + "type": "powervs", + "zone": "{{user `zone`}}" } ], "post-processors": [ @@ -41,7 +41,7 @@ "type": "manifest" } ], - "provisioners":[ + "provisioners": [ { "ansible_env_vars": [ "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'" @@ -59,28 +59,23 @@ } ], "variables": { - "apikey": "", "account_id": "", - "service_instance_id": "", - "region": "", - "zone": "", - "ssh_private_key_file": "", - "capture_cos_access_key": "", - "capture_cos_secret_key": "", - "capture_cos_bucket": "", - "capture_cos_region": "", - "key_pair_name": "", - "ssh_timeout": "30m", "ansible_common_vars": "", "ansible_extra_vars": "", "ansible_user_vars": "", + "apikey": "", "build_timestamp": "{{timestamp}}", + "capture_cos_access_key": "", + "capture_cos_bucket": "", + "capture_cos_region": "", + "capture_cos_secret_key": "", "containerd_sha256": null, "containerd_url": null, "containerd_version": null, "crictl_url": null, "crictl_version": null, "existing_ansible_ssh_args": "{{env `ANSIBLE_SSH_ARGS`}}", + "key_pair_name": "", "kubernetes_cni_deb_version": null, "kubernetes_cni_http_source": null, "kubernetes_cni_rpm_version": null, @@ -99,6 +94,11 @@ "kubernetes_semver": null, "kubernetes_source_type": null, "manifest_output": "manifest.json", - "python_path": "" + "python_path": "", + "region": "", + "service_instance_id": "", + "ssh_private_key_file": "", + "ssh_timeout": "30m", + "zone": "" } }