diff --git a/hack/release-helper.sh b/hack/release-helper.sh index 14f62e22b..cee896678 100755 --- a/hack/release-helper.sh +++ b/hack/release-helper.sh @@ -63,7 +63,7 @@ update_provider_overlays() { # libvirt uses the dev built image tag_prefix="" - if [[ "${provider}" == "libvirt" ]]; then + if [ "${provider}" == "libvirt" ] || [ "${provider}" == "docker" ] ; then tag_prefix="dev-" fi diff --git a/src/cloud-api-adaptor/go.mod b/src/cloud-api-adaptor/go.mod index 4e2c56113..06d110661 100644 --- a/src/cloud-api-adaptor/go.mod +++ b/src/cloud-api-adaptor/go.mod @@ -46,8 +46,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 github.com/aws/aws-sdk-go-v2/service/iam v1.22.5 github.com/aws/aws-sdk-go-v2/service/s3 v1.38.5 - github.com/confidential-containers/cloud-api-adaptor/src/cloud-providers v0.11.0 - github.com/confidential-containers/cloud-api-adaptor/src/peerpod-ctrl v0.11.0 + github.com/confidential-containers/cloud-api-adaptor/src/cloud-providers v0.12.0 + github.com/confidential-containers/cloud-api-adaptor/src/peerpod-ctrl v0.12.0 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f github.com/docker/docker v25.0.6+incompatible github.com/golang-jwt/jwt/v5 v5.2.1 diff --git a/src/cloud-api-adaptor/install/overlays/aws/kustomization.yaml b/src/cloud-api-adaptor/install/overlays/aws/kustomization.yaml index f42fc09ca..99cf5edb7 100644 --- a/src/cloud-api-adaptor/install/overlays/aws/kustomization.yaml +++ b/src/cloud-api-adaptor/install/overlays/aws/kustomization.yaml @@ -7,7 +7,7 @@ resources: images: - name: cloud-api-adaptor newName: quay.io/confidential-containers/cloud-api-adaptor # change image if needed - newTag: latest + newTag: a7dc1190e98c1d2377b9d235f1e3d91736ce7d60 generatorOptions: disableNameSuffixHash: true diff --git a/src/cloud-api-adaptor/install/overlays/azure/kustomization.yaml b/src/cloud-api-adaptor/install/overlays/azure/kustomization.yaml index 9692e6302..a0d812b43 100644 --- a/src/cloud-api-adaptor/install/overlays/azure/kustomization.yaml +++ b/src/cloud-api-adaptor/install/overlays/azure/kustomization.yaml @@ -7,7 +7,7 @@ resources: images: - name: cloud-api-adaptor newName: quay.io/confidential-containers/cloud-api-adaptor # change image if needed - newTag: latest + newTag: a7dc1190e98c1d2377b9d235f1e3d91736ce7d60 generatorOptions: disableNameSuffixHash: true diff --git a/src/cloud-api-adaptor/install/overlays/docker/kustomization.yaml b/src/cloud-api-adaptor/install/overlays/docker/kustomization.yaml index 1c8392a35..94861a58a 100644 --- a/src/cloud-api-adaptor/install/overlays/docker/kustomization.yaml +++ b/src/cloud-api-adaptor/install/overlays/docker/kustomization.yaml @@ -7,7 +7,7 @@ bases: images: - name: cloud-api-adaptor newName: quay.io/confidential-containers/cloud-api-adaptor # change image if needed - newTag: latest + newTag: dev-a7dc1190e98c1d2377b9d235f1e3d91736ce7d60 generatorOptions: disableNameSuffixHash: true diff --git a/src/cloud-api-adaptor/install/overlays/gcp/kustomization.yaml b/src/cloud-api-adaptor/install/overlays/gcp/kustomization.yaml index 77823af10..e62818f4e 100644 --- a/src/cloud-api-adaptor/install/overlays/gcp/kustomization.yaml +++ b/src/cloud-api-adaptor/install/overlays/gcp/kustomization.yaml @@ -7,7 +7,7 @@ resources: images: - name: cloud-api-adaptor newName: 192.168.122.1:5000/cloud-api-adaptor # change image if needed - newTag: latest + newTag: a7dc1190e98c1d2377b9d235f1e3d91736ce7d60 generatorOptions: disableNameSuffixHash: true diff --git a/src/cloud-api-adaptor/install/overlays/ibmcloud-powervs/kustomization.yaml b/src/cloud-api-adaptor/install/overlays/ibmcloud-powervs/kustomization.yaml index 452b4be15..d5e5e4e71 100644 --- a/src/cloud-api-adaptor/install/overlays/ibmcloud-powervs/kustomization.yaml +++ b/src/cloud-api-adaptor/install/overlays/ibmcloud-powervs/kustomization.yaml @@ -7,7 +7,7 @@ resources: images: - name: cloud-api-adaptor newName: quay.io/confidential-containers/cloud-api-adaptor # change image if needed - newTag: latest + newTag: a7dc1190e98c1d2377b9d235f1e3d91736ce7d60 generatorOptions: disableNameSuffixHash: true diff --git a/src/cloud-api-adaptor/install/overlays/ibmcloud/kustomization.yaml b/src/cloud-api-adaptor/install/overlays/ibmcloud/kustomization.yaml index 341271f9e..5f28fe4de 100644 --- a/src/cloud-api-adaptor/install/overlays/ibmcloud/kustomization.yaml +++ b/src/cloud-api-adaptor/install/overlays/ibmcloud/kustomization.yaml @@ -7,7 +7,7 @@ resources: images: - name: cloud-api-adaptor newName: quay.io/confidential-containers/cloud-api-adaptor # change image if needed - newTag: latest + newTag: a7dc1190e98c1d2377b9d235f1e3d91736ce7d60 generatorOptions: disableNameSuffixHash: true diff --git a/src/cloud-api-adaptor/install/overlays/libvirt/kustomization.yaml b/src/cloud-api-adaptor/install/overlays/libvirt/kustomization.yaml index 5de1893ac..f1ecb65d0 100644 --- a/src/cloud-api-adaptor/install/overlays/libvirt/kustomization.yaml +++ b/src/cloud-api-adaptor/install/overlays/libvirt/kustomization.yaml @@ -7,7 +7,7 @@ resources: images: - name: cloud-api-adaptor newName: quay.io/confidential-containers/cloud-api-adaptor # change image if needed - newTag: latest + newTag: dev-a7dc1190e98c1d2377b9d235f1e3d91736ce7d60 generatorOptions: disableNameSuffixHash: true diff --git a/src/cloud-api-adaptor/install/overlays/vsphere/kustomization.yaml b/src/cloud-api-adaptor/install/overlays/vsphere/kustomization.yaml index 14f5d1ffa..f32d81d7f 100644 --- a/src/cloud-api-adaptor/install/overlays/vsphere/kustomization.yaml +++ b/src/cloud-api-adaptor/install/overlays/vsphere/kustomization.yaml @@ -7,7 +7,7 @@ resources: images: - name: cloud-api-adaptor newName: quay.io/confidential-containers/cloud-api-adaptor # change image if needed - newTag: latest + newTag: a7dc1190e98c1d2377b9d235f1e3d91736ce7d60 generatorOptions: disableNameSuffixHash: true diff --git a/src/csi-wrapper/go.mod b/src/csi-wrapper/go.mod index 6392f9818..7e6750340 100644 --- a/src/csi-wrapper/go.mod +++ b/src/csi-wrapper/go.mod @@ -3,7 +3,7 @@ module github.com/confidential-containers/cloud-api-adaptor/src/csi-wrapper go 1.22.0 require ( - github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor v0.11.0 + github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor v0.12.0 github.com/container-storage-interface/spec v1.8.0 github.com/containerd/ttrpc v1.2.3 github.com/gofrs/uuid v4.4.0+incompatible diff --git a/src/peerpod-ctrl/go.mod b/src/peerpod-ctrl/go.mod index 3f8c92a77..6e79df1bf 100644 --- a/src/peerpod-ctrl/go.mod +++ b/src/peerpod-ctrl/go.mod @@ -3,7 +3,7 @@ module github.com/confidential-containers/cloud-api-adaptor/src/peerpod-ctrl go 1.22.0 require ( - github.com/confidential-containers/cloud-api-adaptor/src/cloud-providers v0.11.0 + github.com/confidential-containers/cloud-api-adaptor/src/cloud-providers v0.12.0 github.com/onsi/ginkgo/v2 v2.8.1 github.com/onsi/gomega v1.27.1 k8s.io/api v0.26.0