From df5cfdde61e1cbddec00c3d9b310509791af023d Mon Sep 17 00:00:00 2001
From: Beraldo Leal <bleal@redhat.com>
Date: Fri, 7 Jun 2024 11:07:31 -0400
Subject: [PATCH] gcp: cri_runtime_endpoint.yaml is not used anymore

And removing deprecated bases.

Signed-off-by: Beraldo Leal <bleal@redhat.com>
---
 .../overlays/gcp/cri_runtime_endpoint.yaml    | 22 -------------------
 .../install/overlays/gcp/kustomization.yaml   |  5 ++---
 2 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 src/cloud-api-adaptor/install/overlays/gcp/cri_runtime_endpoint.yaml

diff --git a/src/cloud-api-adaptor/install/overlays/gcp/cri_runtime_endpoint.yaml b/src/cloud-api-adaptor/install/overlays/gcp/cri_runtime_endpoint.yaml
deleted file mode 100644
index 054a50d69..000000000
--- a/src/cloud-api-adaptor/install/overlays/gcp/cri_runtime_endpoint.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: cloud-api-adaptor-daemonset
-  namespace: confidential-containers-system
-  labels:
-    app: cloud-api-adaptor
-spec:
-  template:
-    spec:
-      containers:
-      - name: cloud-api-adaptor-con
-        volumeMounts:
-        - mountPath: /run/cri-runtime.sock # in-container CRI_RUNTIME_ENDPOINT default
-          name: cri-runtime-endpoint
-      volumes:
-      - name: cri-runtime-endpoint
-        hostPath:
-          path: /run/containerd/containerd.sock # SET! (crio's default: /var/run/crio/crio.sock)
-          type: Socket
-
-# to apply this uncomment the patchesStrategicMerge of this file in kustomization.yaml
diff --git a/src/cloud-api-adaptor/install/overlays/gcp/kustomization.yaml b/src/cloud-api-adaptor/install/overlays/gcp/kustomization.yaml
index 8cb78b090..16d1b14e8 100644
--- a/src/cloud-api-adaptor/install/overlays/gcp/kustomization.yaml
+++ b/src/cloud-api-adaptor/install/overlays/gcp/kustomization.yaml
@@ -1,13 +1,13 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-bases:
+resources:
 - ../../yamls
 
 images:
 - name: cloud-api-adaptor
   newName: 192.168.122.1:5000/cloud-api-adaptor # change image if needed
-  newTag: 47dcc2822b6c2489a02db83c520cf9fdcc833b3f-dirty # change tag if needed
+  newTag: latest
 
 generatorOptions:
   disableNameSuffixHash: true
@@ -50,7 +50,6 @@ secretGenerator:
 ##TLS_SETTINGS
 
 patchesStrategicMerge:
-  #- cri_runtime_endpoint.yaml # set (modify host's runtime cri socket path in the file, default is /run/containerd/containerd.sock)
 ##TLS_SETTINGS
   #- tls_certs_volume_mount.yaml # set (for tls)
 ##TLS_SETTINGS