Merge pull request #55 from sclorg/httpd_migrate_deployment

Httpd migrate deployment
sclorg · Dec 11, 2023 · c15de15 · c15de15
2 parents bab3947 + 67d0b62
commit c15de15
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/charts/redhat/httpd-template/src/Chart.yaml b/charts/redhat/httpd-template/src/Chart.yaml
@@ -1,13 +1,13 @@
-description: This content is expermental, do not use it in production. An example Apache HTTP Server (httpd) application that serves static
+description: This content is experimental, do not use it in production. An example Apache HTTP Server (httpd) application that serves static
   content. For more information about using this template, including OpenShift considerations,
   see https://github.com/sclorg/httpd-container/blob/master/README.md.
 name: httpd-template
 tags: quickstart,httpd
 kubeVersion: '>=1.20.0'
-version: 0.0.4
+version: 0.0.5
 annotations:
   charts.openshift.io/name: Red Hat Apache HTTP Server (httpd) application (experimental).
 apiVersion: v2
-appVersion: 0.0.4
+appVersion: 0.0.5
 sources:
   - https://github.com/sclorg/helm-charts
diff --git a/...plate/src/templates/deploymentconfig.yaml → ...pd-template/src/templates/deployment.yaml b/...plate/src/templates/deploymentconfig.yaml → ...pd-template/src/templates/deployment.yaml
@@ -1,19 +1,30 @@
-apiVersion: apps.openshift.io/v1
-kind: DeploymentConfig
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   annotations:
     description: Defines how to deploy the application server
     template.alpha.openshift.io/wait-for-ready: "true"
+    image.openshift.io/triggers: |-
+      [
+        {
+          "from": {
+            "kind": "ImageStreamTag",
+            "name": "{{ .Values.name }}:latest"
+          },
+          "fieldPath": "spec.template.spec.containers[0].image"
+        }
+      ]
   labels:
     app: httpd-example
     template: httpd-example
   name: {{ .Values.name }}
 spec:
   replicas: 1
   selector:
-    name: {{ .Values.name }}
+    matchLabels:
+      name: {{ .Values.name }}
   strategy:
-    type: Rolling
+    type: RollingUpdate
   template:
     metadata:
       labels:
@@ -22,7 +33,7 @@ spec:
     spec:
       containers:
       - env: []
-        image: "{{ .Values.name }}:latest"
+        image: " "
         livenessProbe:
           httpGet:
             path: /
@@ -41,14 +52,3 @@ spec:
         resources:
           limits:
             memory: {{ .Values.memory_limit }}
-  triggers:
-  - imageChangeParams:
-      automatic: true
-      containerNames:
-      - httpd-example
-      from:
-        kind: ImageStreamTag
-        name: "{{ .Values.name }}:latest"
-        namespace: {{ .Values.namespace }}
-    type: ImageChange
-  - type: ConfigChange
diff --git a/httpd-template-0.0.5.tgz b/httpd-template-0.0.5.tgz
diff --git a/tests/test_httpd_template.py b/tests/test_httpd_template.py
@@ -23,7 +23,7 @@ def test_package_persistent(self):
         self.hc_api.package_name = "httpd-imagestreams"
         self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
-        self.hc_api.set_version("0.0.4")
+        self.hc_api.set_version("0.0.5")
         self.hc_api.package_name = "httpd-template"
         self.hc_api.helm_package()
         assert self.hc_api.helm_installation(
@@ -32,7 +32,7 @@ def test_package_persistent(self):
                 "namespace": self.hc_api.namespace
             }
         )
-        assert self.hc_api.is_pod_running()
+        assert self.hc_api.is_s2i_pod_running()
         assert self.hc_api.test_helm_curl_output(
             route_name="httpd",
             expected_str="Welcome to your static httpd application on OpenShift"