Merge pull request #348 from 3scale/modernize-suggestions

Some suggestions

Author: mayorova

.gitignore

@@ -12,6 +12,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea
 
 .*.swp
 # YARD artifacts

Dockerfile

@@ -41,7 +41,6 @@ COPY --chown=1001:1001 ./ "${HOME}/app/"
 
 # Runtime image
 FROM base AS production
-MAINTAINER Alejandro Martinez Ruiz <amr@redhat.com>
 
 USER 1001:1001
 

contrib/openshift/README.md

@@ -6,7 +6,7 @@ You can use two different backend templates:
 * I just need an echo-api deployed: echo-api-template.yml (uses prebuilt docker images)
 * I want to modify/devel echo-api:
 	1. Go to ../
-	2. Make your changes on the aplication files (app.json, config.ru, echo_api.rb).
+	2. Make your changes on the application files (app.json, config.ru, echo_api.rb).
 	3. make update
 
 ## Downloading the CLI

contrib/openshift/echo-api-template.yml

@@ -7,65 +7,68 @@ metadata:
     description: "3scale Echo API"
     iconClass: "icon-ruby"
     tags: "api,echo-api,3scale"
+  labels:
+    app: echo-api
 
 objects:
 
-- apiVersion: apps.openshift.io/v1
-  kind: DeploymentConfig
+- apiVersion: apps/v1
+  kind: Deployment
   metadata:
     name: echo-api
+    labels:
+      app: echo-api
   spec:
     replicas: 1
     selector:
-      deploymentconfig: echo-api
+      matchLabels:
+        app: echo-api
     strategy:
       rollingParams:
         intervalSeconds: 1
         maxSurge: 25%
         maxUnavailable: 25%
         timeoutSeconds: 180
         updatePeriodSeconds: 1
-      type: Rolling
+      type: RollingUpdate
     template:
       metadata:
         labels:
-          deploymentconfig: echo-api
+          app: echo-api
       spec:
         containers:
         - image: ${ECHOAPI_IMAGE}
           imagePullPolicy: Always
           name: echo-api
           livenessProbe:
             tcpSocket:
-              port: 9292 
+              port: 9292
             initialDelaySeconds: 10
             timeoutSeconds: 1
           readinessProbe:
             httpGet:
-              path: /test/200 
+              path: /test/200
               port: 9292 
             initialDelaySeconds: 15
             timeoutSeconds: 1
           ports:
-          - containerPort: 9292 
+          - containerPort: 9292
             protocol: TCP
-        imagePullSecrets:
-          - name: quay-auth
-    triggers:
-    - type: ConfigChange
 
 - apiVersion: v1
   kind: Service
   metadata:
     name: echo-api
+    labels:
+      app: echo-api
   spec:
     ports:
     - name: echo-api-port
       port: 80
       protocol: TCP
       targetPort: 9292
     selector:
-      deploymentconfig: echo-api
+      app: echo-api
 
 - apiVersion: route.openshift.io/v1
   kind: Route
@@ -74,7 +77,7 @@ objects:
     labels:
       app: echo-api
   spec:
-    host: ${ECHOAPI_HOST} 
+    host: ${ECHOAPI_HOST}
     to:
       kind: Service
       name: echo-api
@@ -90,7 +93,6 @@ parameters:
   value: "quay.io/3scale/echoapi:stable"
   required: true
 
-
 - name: ECHOAPI_HOST
   description: "Host for the Route Object"
   required: true