Update 0.8.x branch for 0.8.2 release (#399)

* Update sample to OpenLiberty getting started app

* Check for secrets only if service account pull secrets exist

The operator checks if secret resource exists even if service account
does not have pull secret added. Check only if pull secret
is added to service account.

* Update version to 0.8.2

* Increase manager memory limit from 256 to 512

* Get e2e minikube tests running on 0.8.x

* Minikube script, build and test files update

* Run e2e testing for 0.8.x branch

Co-authored-by: Melissa Lee <[email protected]>

Author: idlewis

.travis.yml

@@ -16,7 +16,9 @@ stages:
   # Builds are split into 'e2e-test' and 'build' to allow e2e tests to run first. If e2e fails, don't bother
   # building and pushing the images for the other architectures.
   - name: e2e-test
-    if: (branch = main OR tag =~ ^v) AND fork = false AND type != cron
+    if: (branch = main OR branch = 0.8.x OR tag =~ ^v) AND fork = false AND type != cron
+  - name: minikube-e2e-test
+    if: (branch = main OR branch = 0.8.x OR tag =~ ^v) AND fork = false AND type != cron
   - name: build
     if: (branch = main OR tag =~ ^v) AND fork = false AND type != pull_request AND type != cron
   - name: build-manifest
@@ -39,6 +41,11 @@ jobs:
       os: linux
       arch: amd64
       script: travis_wait 45 make setup test-e2e || travis_terminate 1
+    - name: Build image on amd64 and test on Minikube
+      stage: minikube-e2e-test
+      os: linux
+      arch: amd64
+      script: travis_wait 45 make setup minikube-test-e2e || travis_terminate 1
     - name: Build image on ppc64le
       stage: build
       os: linux

Dockerfile

@@ -29,7 +29,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
 LABEL vendor="Runtime Component Community" \
       name="Runtime Component Operator" \
-      version="0.8.1" \
+      version="0.8.2" \
       summary="Image for Runtime Component Operator" \
       description="This image contains the controller for Runtime Component Operator. See https://github.com/application-stacks/runtime-component-operator"
 

Makefile

@@ -1,7 +1,7 @@
 OPERATOR_SDK_RELEASE_VERSION ?= v1.6.4
 
 # Current Operator version
-VERSION ?= 0.8.1
+VERSION ?= 0.8.2
 
 OPERATOR_IMAGE ?= applicationstacks/operator
 
@@ -164,6 +164,9 @@ build-manifest: setup-manifest
 setup-manifest:
 	./scripts/installers/install-manifest-tool.sh
 
+minikube-test-e2e:
+	./scripts/e2e-minikube.sh --test-tag "${TRAVIS_BUILD_NUMBER}"
+
 test-e2e:
 	./scripts/e2e-release.sh --registry-name default-route --registry-namespace openshift-image-registry \
                      --test-tag "${TRAVIS_BUILD_NUMBER}" --target "${RELEASE_TARGET}"

bundle/manifests/runtime-component.clusterserviceversion.yaml

@@ -11,7 +11,7 @@ metadata:
             "name": "runtimecomponent-sample"
           },
           "spec": {
-            "applicationImage": "registry.connect.redhat.com/ibm/open-liberty-samples:springPetClinic",
+            "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started",
             "expose": true,
             "replicas": 1,
             "service": {
@@ -39,12 +39,12 @@ metadata:
     certified: "true"
     createdAt: "2022-02-25T09:00:00Z"
     description: Deploys any runtime component with dynamic and auto-tuning configuration
-    olm.skipRange: <0.8.1
+    olm.skipRange: <0.8.2
     operators.operatorframework.io/builder: operator-sdk-v1.6.1+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/application-stacks/runtime-component-operator
     support: Community
-  name: runtime-component.v0.8.1
+  name: runtime-component.v0.8.2
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -429,7 +429,7 @@ spec:
                 resources:
                   limits:
                     cpu: 200m
-                    memory: 256Mi
+                    memory: 512Mi
                   requests:
                     cpu: 100m
                     memory: 20Mi
@@ -599,4 +599,4 @@ spec:
   maturity: beta
   provider:
     name: Community
-  version: 0.8.1
+  version: 0.8.2

bundle/tests/scorecard/kuttl/affinity/00-node-no-affinity.yaml

@@ -7,7 +7,7 @@ metadata:
     test: affinity
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1
   affinity:
     nodeAffinityLabels:

bundle/tests/scorecard/kuttl/affinity/01-node-affinity-label.yaml

@@ -7,8 +7,8 @@ metadata:
     test: affinity
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1
   affinity:
     nodeAffinityLabels:
-      kuttlTest: test1
+      kuttlTest: test1

bundle/tests/scorecard/kuttl/affinity/02-pod-affinity.yaml

@@ -7,7 +7,7 @@ metadata:
     test: affinity
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1
   affinity:
     podAffinity:
@@ -22,4 +22,4 @@ spec:
   statefulSet:
     storage:
       size: "10Mi"
-      mountPath: "/mnt/data"
+      mountPath: "/mnt/data"

bundle/tests/scorecard/kuttl/affinity/03-pod-antiaffinity.yaml

@@ -7,7 +7,7 @@ metadata:
     test: affinity
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1
   affinity:
     podAntiAffinity:
@@ -20,4 +20,4 @@ spec:
               operator: In
               values:
                 - node-affinity-label-rc
-          topologyKey: kubernetes.io/hostname
+          topologyKey: kubernetes.io/hostname

bundle/tests/scorecard/kuttl/affinity/04-node-affinity.yaml

@@ -7,7 +7,7 @@ metadata:
     test: affinity
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1
   affinity:
     nodeAffinity:
@@ -21,4 +21,4 @@ spec:
   statefulSet:
     storage:
       size: "10Mi"
-      mountPath: "/mnt/data"
+      mountPath: "/mnt/data"

bundle/tests/scorecard/kuttl/annotations/00-rc-deployment.yaml

@@ -7,7 +7,7 @@ metadata:
     conflict: component
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1
   deployment:
     annotations:

bundle/tests/scorecard/kuttl/annotations/01-rc-statefulset.yaml

@@ -6,7 +6,7 @@ metadata:
     foo1: bar1
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1
   statefulSet:
     annotations:

bundle/tests/scorecard/kuttl/auto1/00-runtime-basic.yaml

@@ -4,5 +4,5 @@ metadata:
   name: autoscaling1-rc
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1

bundle/tests/scorecard/kuttl/auto2/00-runtime-basic.yaml

@@ -4,5 +4,5 @@ metadata:
   name: scale2-runtime-component
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1

bundle/tests/scorecard/kuttl/auto3/00-runtime-basic.yaml

@@ -4,5 +4,5 @@ metadata:
   name: scale3-runtime-component
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1

bundle/tests/scorecard/kuttl/auto3/01-add-scaling.yaml

@@ -5,7 +5,7 @@ metadata:
 spec:
   resources:
     requests:
-      cpu: "0.5"
+      cpu: "0.2"
   autoscaling:
     maxReplicas: 5
     minReplicas: 3

bundle/tests/scorecard/kuttl/basic/00-runtime-basic.yaml

@@ -4,6 +4,6 @@ metadata:
   name: example-runtime-component
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1
 

bundle/tests/scorecard/kuttl/day2operation/00-runtime.yaml

@@ -4,7 +4,7 @@ metadata:
   name: day2-operation-rc
 spec:
   # Add fields here
-  applicationImage: 'navidsh/demo-day'
+  applicationImage: navidsh/demo-day
   replicas: 1
   statefulSet:
     storage:

bundle/tests/scorecard/kuttl/day2operation/02-runtime-no-replicas.yaml

@@ -5,5 +5,5 @@ metadata:
   name: day2-operation-rc
 spec:
   # Add fields here
-  applicationImage: 'navidsh/demo-day'
-  replicas: 0
+  applicationImage: navidsh/demo-day
+  replicas: 0

bundle/tests/scorecard/kuttl/day2operation/04-runtime-new-replica.yaml

@@ -5,5 +5,5 @@ metadata:
   name: day2-operation-rc
 spec:
   # Add fields here
-  applicationImage: 'navidsh/demo-day'
-  replicas: 1
+  applicationImage: navidsh/demo-day
+  replicas: 1

bundle/tests/scorecard/kuttl/monitor/00-runtime-basic.yaml

@@ -4,7 +4,7 @@ metadata:
   name: service-monitor-rc
 spec:
   # Add fields here
-  applicationImage: 'navidsh/demo-day'
+  applicationImage: navidsh/demo-day
   service:
     type: "ClusterIP"
     port: 3000

bundle/tests/scorecard/kuttl/route-certificate/01-rc-with-cert.yaml

@@ -4,7 +4,7 @@ metadata:
   name: route-with-cert-rc
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1
   expose: true
   route:

bundle/tests/scorecard/kuttl/route-certificate/02-delete-route.yaml

@@ -4,7 +4,7 @@ metadata:
   name: route-with-cert-rc
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1
   expose: true
   route:

bundle/tests/scorecard/kuttl/routes/00-route.yaml

@@ -4,7 +4,7 @@ metadata:
   name: route
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1
   expose: true
   route:

bundle/tests/scorecard/kuttl/routes/01-delete-route.yaml

@@ -4,7 +4,7 @@ metadata:
   name: route
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1
   expose: false
 

bundle/tests/scorecard/kuttl/service-certificate/01-rc-with-cert.yaml

@@ -4,7 +4,7 @@ metadata:
   name: service-with-cert-rc
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1
   service:
     certificateSecretRef: service-tls-secret

bundle/tests/scorecard/kuttl/service-certificate/02-remove-cert.yaml

@@ -4,7 +4,7 @@ metadata:
   name: service-with-cert-rc
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1
   service:
     certificateSecretRef:

bundle/tests/scorecard/kuttl/storage/00-runtime-storage.yaml

@@ -6,7 +6,7 @@ metadata:
   name: storage-rc
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1
   statefulSet:
     storage:

bundle/tests/scorecard/kuttl/storage/01-runtime-no-storage.yaml

@@ -6,7 +6,7 @@ metadata:
   name: storage-rc
 spec:
   # Add fields here
-  applicationImage: 'k8s.gcr.io/pause:2.0'
+  applicationImage: k8s.gcr.io/pause:2.0
   replicas: 1
   statefulSet:
 

bundle/tests/scorecard/minikube-kuttl/ingress-certificate/00-assert.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Secret
+type: kubernetes.io/tls
+metadata:
+  name: ingress-tls-secret
+data:
+  ca.crt: Y2FjcnQK
+  destCA.crt: ZGVzdENBY3J0Cg==
+  tls.crt: dGxzY3J0Cg==
+  tls.key: dGxza2V5Cg==

bundle/tests/scorecard/minikube-kuttl/ingress-certificate/00-secret.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: ingress-tls-secret
+type: kubernetes.io/tls
+data:
+  # 'tlscrt'
+  tls.crt: dGxzY3J0Cg==
+  # 'tlskey'
+  tls.key: dGxza2V5Cg==
+  # 'cacrt'
+  ca.crt: Y2FjcnQK
+  # 'destCAcrt'
+  destCA.crt: ZGVzdENBY3J0Cg==

bundle/tests/scorecard/minikube-kuttl/ingress-certificate/01-assert.yaml

@@ -0,0 +1,24 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: ingress-with-cert-rc
+status:
+  replicas: 1
+  readyReplicas: 1
+  updatedReplicas: 1
+---
+kind: Ingress
+apiVersion: extensions/v1beta1
+metadata:
+  name: ingress-with-cert-rc
+spec:
+  tls:
+    - hosts:
+        - myapp.mycompany.com
+      secretName: ingress-tls-secret
+  rules:
+    - host: myapp.mycompany.com
+      http:
+        paths:
+          - path: /
+            pathType: Prefix

bundle/tests/scorecard/minikube-kuttl/ingress-certificate/01-rc-with-cert.yaml

@@ -0,0 +1,16 @@
+apiVersion: rc.app.stacks/v1beta2
+kind: RuntimeComponent
+metadata:
+  name: ingress-with-cert-rc
+spec:
+  # Add fields here
+  applicationImage: k8s.gcr.io/pause:2.0
+  replicas: 1
+  expose: true
+  route:
+    host: myapp.mycompany.com
+    path: "/"
+    pathType: Prefix
+    certificateSecretRef: ingress-tls-secret
+    termination: reencrypt
+

bundle/tests/scorecard/minikube-kuttl/ingress-certificate/02-assert.yaml

@@ -0,0 +1,8 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: ingress-with-cert-rc
+status:
+  replicas: 1
+  readyReplicas: 1
+  updatedReplicas: 1