create a new ci flow that is a subset of the kustomize dev flow

Author: gabemontero

.gitignore

@@ -41,5 +41,6 @@ nb-configuration.xml
 .envrc
 *.out
 
-# Kustomize overlays for development
-deploy/**/development/**
+# Kustomize overlays for development, openshift ci
+deploy/**/development/**
+deploy/**/ci-final/**

deploy/openshift-ci.sh

@@ -2,10 +2,33 @@
 
 echo "Executing openshift-ci.sh"
 
+echo "jvm build service golang operator image:"
+echo ${JVM_BUILD_SERVICE_IMAGE}
+echo "jvm build service jvm cache image:"
+echo ${JVM_BUILD_SERVICE_CACHE_IMAGE}
+echo "jvm build service jvm sidecar image:"
+echo ${JVM_BUILD_SERVICE_SIDECAR_IMAGE}
+echo "jvm build service jvm analyzer image:"
+echo ${JVM_BUILD_SERVICE_ANALYZER_IMAGE}
+echo "jvm build service jvm reqprocessor image:"
+echo ${JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE}
+
 DIR=`dirname $0`
 echo "Running out of ${DIR}"
 $DIR/install-openshift-pipelines.sh
-oc apply -f $DIR/namespace.yaml
-$DIR/patch-yaml.sh
-oc apply -k $DIR/overlays/development
-
+oc create ns jvm-build-service || true
+find $DIR -name ci-final -exec rm -r {} \;
+find $DIR -name ci-template -exec cp -r {} {}/../ci-final \;
+# copy this over since if updates more frequently
+cp $DIR/base/system-config.yaml $DIR/overlays/ci-final/system-config-builders.yaml
+find $DIR -path \*ci-final\*.yaml -exec sed -i s%jvm-build-service-image%${JVM_BUILD_SERVICE_IMAGE}% {} \;
+find $DIR -path \*ci-final\*.yaml -exec sed -i s%jvm-build-service-cache-image%${JVM_BUILD_SERVICE_CACHE_IMAGE}% {} \;
+find $DIR -path \*ci-final\*.yaml -exec sed -i s%jvm-build-service-sidecar-image%${JVM_BUILD_SERVICE_SIDECAR_IMAGE}% {} \;
+find $DIR -path \*ci-final\*.yaml -exec sed -i s%jvm-build-service-analyzer-image%${JVM_BUILD_SERVICE_ANALYZER_IMAGE}% {} \;
+find $DIR -path \*ci-final\*.yaml -exec sed -i s%jvm-build-service-reqprocessor-image%${JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE}% {} \;
+find $DIR -path \*ci-final\*.yaml -exec sed -i s/ci-template/ci-final/ {} \;
+oc apply -k $DIR/crds/base
+oc apply -f $DIR/operator/base/sa.yaml
+oc apply -f $DIR/operator/base/rbac.yaml
+oc apply -k $DIR/operator/overlays/ci-final
+oc apply -k $DIR/overlays/ci-final

deploy/operator/overlays/ci-template/base-deployment.yaml

@@ -0,0 +1,30 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: hacbs-jvm-operator
+  namespace: jvm-build-service
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: hacbs-jvm-operator
+  template:
+    metadata:
+      labels:
+        app: hacbs-jvm-operator
+    spec:
+      containers:
+        - name: hacbs-jvm-operator
+          image: jvm-build-service-image
+          imagePullPolicy: Always
+          env:
+            - name: RECIPE_DATABASE
+              value: "https://github.com/redhat-appstudio/jvm-build-data"
+          resources:
+            requests:
+              memory: "256Mi"
+              cpu: "500m"
+            limits:
+              memory: "256Mi"
+              cpu: "500m"
+      serviceAccountName: hacbs-jvm-operator

deploy/operator/overlays/ci-template/kustomization.yaml

@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - operator-images.yaml
+
+patchesStrategicMerge:
+  # this is a copy of deploy/operator/base/deployment.yaml, but needed because image substitution works differently in CI vs. dev flow,
+  # and I'm bypassing that gross env var munging we had to do in infra-deps; also, the deployment yaml should be pretty static at this point
+  - base-deployment.yaml

deploy/operator/overlays/ci-template/operator-images.yaml

@@ -0,0 +1,15 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: hacbs-jvm-operator
+  namespace: jvm-build-service
+spec:
+  template:
+    spec:
+      containers:
+        - name: hacbs-jvm-operator
+          env:
+            - name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
+              value: jvm-build-service-reqprocessor-image
+            - name: JVM_BUILD_SERVICE_SIDECAR_IMAGE
+              value: jvm-build-service-sidecar-image

deploy/overlays/ci-template/kustomization.yaml

@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - system-config.yaml
+
+patchesStrategicMerge:
+  # see copy from openshift-ci.sh of deploy/base/system-config.yaml
+  - system-config-builders.yaml
+  - https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service-builder-images/fbe0f42ebe3d50b16d454c95207dd15be6b5008f/image-config.yaml

deploy/overlays/ci-template/system-config.yaml

@@ -0,0 +1,8 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: jvm-build-system-config
+  namespace: jvm-build-service
+data:
+  image.cache: jvm-build-service-cache-image