From 788ff6f9dd8709d417f2495364d9c906d14e2d9f Mon Sep 17 00:00:00 2001
From: Alex Corvin <acorvin@redhat.com>
Date: Wed, 12 Jun 2024 08:51:53 -0400
Subject: [PATCH] Switch s3-webserver from DC to deployment

---
 ...{deploymentconfig.yaml => deployment.yaml} | 19 +++++++------------
 s3-webserver/base/imagestream.yaml            | 13 -------------
 s3-webserver/base/kustomization.yaml          |  3 +--
 3 files changed, 8 insertions(+), 27 deletions(-)
 rename s3-webserver/base/{deploymentconfig.yaml => deployment.yaml} (81%)
 delete mode 100644 s3-webserver/base/imagestream.yaml

diff --git a/s3-webserver/base/deploymentconfig.yaml b/s3-webserver/base/deployment.yaml
similarity index 81%
rename from s3-webserver/base/deploymentconfig.yaml
rename to s3-webserver/base/deployment.yaml
index 7aacd9c1..fff7edcf 100644
--- a/s3-webserver/base/deploymentconfig.yaml
+++ b/s3-webserver/base/deployment.yaml
@@ -1,5 +1,5 @@
-apiVersion: apps.openshift.io/v1
-kind: DeploymentConfig
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: cvp-webserver
   labels:
@@ -7,6 +7,10 @@ metadata:
     template: s3webserver
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: s3webserver
+      component: cvp-webserver-s3webserver
   template:
     metadata:
       name: s3webserver
@@ -18,6 +22,7 @@ spec:
       containers:
         - name: s3webserver
           imagePullPolicy: Always
+          image: quay.io/internaldatahub/s3-webserver:latest
           resources:
             limits:
               cpu: 100m
@@ -47,13 +52,3 @@ spec:
         - name: config
           configMap:
             name: cvp-webserver-s3webserver-config
-  triggers:
-    - type: ConfigChange
-    - type: ImageChange
-      imageChangeParams:
-        automatic: true
-        from:
-          kind: ImageStreamTag
-          name: s3webserver:latest
-        containerNames:
-          - s3webserver
diff --git a/s3-webserver/base/imagestream.yaml b/s3-webserver/base/imagestream.yaml
deleted file mode 100644
index 9d99af8d..00000000
--- a/s3-webserver/base/imagestream.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: image.openshift.io/v1
-kind: ImageStream
-metadata:
-  labels:
-    app: s3webserver
-    template: s3webserver
-  name: s3webserver
-spec:
-  tags:
-    - name: latest
-      from:
-        kind: DockerImage
-        name: 'quay.io/internaldatahub/s3-webserver:latest'
diff --git a/s3-webserver/base/kustomization.yaml b/s3-webserver/base/kustomization.yaml
index 9b80c948..b31241fe 100644
--- a/s3-webserver/base/kustomization.yaml
+++ b/s3-webserver/base/kustomization.yaml
@@ -3,10 +3,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - imagestream.yaml
   - service.yaml
   - routes.yaml
-  - deploymentconfig.yaml
+  - deployment.yaml
   - configmap.yaml
 
 generators: