Merge pull request #2000 from tecarter94/maven-repo-for-testing

Run reposilite and deploy to during minikube pipeline

Author: rnc

.github/workflows/minikube.yaml

@@ -67,6 +67,9 @@ jobs:
           export QUAY_USERNAME=minikube
           export DEV_IP=172.16.1.1
           export JBS_WORKER_NAMESPACE=jvm-build-service-test-namespace-$(shuf -er -n5 {a..z} {0..9} | tr -d '\n')
+          export MAVEN_USERNAME=admin
+          export MAVEN_PASSWORD=secret
+          export MAVEN_REPOSITORY='http://jvm-build-maven-repo.$(context.taskRun.namespace).svc.cluster.local/releases'
 
           eval $(minikube -p minikube docker-env)
 
@@ -125,6 +128,9 @@ jobs:
           export QUAY_USERNAME=minikube
           export DEV_IP=172.16.1.1
           export JBS_WORKER_NAMESPACE=jvm-build-service-test-namespace-$(shuf -er -n5 {a..z} {0..9} | tr -d '\n')
+          export MAVEN_USERNAME=admin
+          export MAVEN_PASSWORD=secret
+          export MAVEN_REPOSITORY='http://jvm-build-maven-repo.$(context.taskRun.namespace).svc.cluster.local/releases'
 
           eval $(minikube -p minikube docker-env)
 

deploy/crds/base/jvmbuildservice.io_jbsconfigs.yaml

@@ -116,6 +116,8 @@ spec:
                 type: object
               mavenDeployment:
                 properties:
+                  onlyDeploy:
+                    type: boolean
                   repository:
                     type: string
                   username:

deploy/maven-repo.yaml

@@ -0,0 +1,89 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: jvm-build-maven-repo
+  namespace: test-jvm-namespace
+spec:
+  revisionHistoryLimit: 0
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      app: jvm-build-maven-repo
+  template:
+    metadata:
+      labels:
+        app: jvm-build-maven-repo
+    spec:
+      serviceAccountName: pipeline
+      securityContext:
+        runAsUser: 0
+      containers:
+        - name: jvm-build-maven-repo
+          image: ${REPOSILITE_IMAGE}
+          imagePullPolicy: IfNotPresent
+          ports:
+            - name: http
+              containerPort: 8080
+              protocol: TCP
+          resources:
+            requests:
+              memory: 256Mi
+              cpu: 100m
+            limits:
+              memory: 256Mi
+              cpu: 100m
+          startupProbe:
+            failureThreshold: 120
+            periodSeconds: 1
+            httpGet:
+              path: /
+              port: 8080
+              scheme: HTTP
+          livenessProbe:
+            failureThreshold: 3
+            periodSeconds: 5
+            httpGet:
+              path: /
+              port: 8080
+              scheme: HTTP
+          env:
+            - name: REPOSILITE_OPTS
+              value: "--token ${MAVEN_USERNAME}:${MAVEN_PASSWORD}"
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: jvm-build-maven-repo
+  namespace: test-jvm-namespace
+spec:
+  ports:
+    - name: http
+      protocol: TCP
+      port: 80
+      targetPort: 8080
+  type: ClusterIP
+  selector:
+    app: jvm-build-maven-repo
+---
+kind: Route
+apiVersion: route.openshift.io/v1
+metadata:
+  name: maven-repo
+  namespace: test-jvm-namespace
+  labels:
+    app: jvm-build-maven-repo
+  annotations:
+    openshift.io/host.generated: 'true'
+spec:
+  to:
+    kind: Service
+    name: jvm-build-maven-repo
+    weight: 100
+  port:
+    targetPort: http
+  tls:
+    termination: edge
+    insecureEdgeTerminationPolicy: Redirect
+  wildcardPolicy: None
+

deploy/openshift-development.sh

@@ -1,4 +1,25 @@
 #!/bin/sh
 
+deploy_maven_repo=false
+
+if [ -z "$MAVEN_USERNAME" ]; then
+    export MAVEN_USERNAME=admin
+    deploy_maven_repo=true
+fi
+if [ -z "$MAVEN_PASSWORD" ]; then
+    export MAVEN_PASSWORD=secret
+    deploy_maven_repo=true
+fi
+if [ -z "$MAVEN_REPOSITORY" ]; then
+    export MAVEN_REPOSITORY='http://jvm-build-maven-repo.$(context.taskRun.namespace).svc.cluster.local/releases'
+    deploy_maven_repo=true
+fi
+
 DIR=`dirname $0`
 $DIR/base-development.sh $1
+
+if [ "$deploy_maven_repo" = true ]; then
+    export REPOSILITE_IMAGE=$(sed -n 's/^FROM //p' $DIR/../openshift-with-appstudio-test/e2e/Dockerfile.reposilite)
+    kubectl delete --ignore-not-found deployment,service,route jvm-build-maven-repo maven-repo -n test-jvm-namespace
+    cat $DIR/maven-repo.yaml | envsubst '${MAVEN_PASSWORD} ${MAVEN_USERNAME} ${REPOSILITE_IMAGE}' | kubectl create -f -
+fi

deploy/overlays/dev-template/config.yaml

@@ -14,6 +14,7 @@ spec:
   mavenDeployment:
     username: ${MAVEN_USERNAME}
     repository: ${MAVEN_REPOSITORY}
+    onlyDeploy: true
   gitSourceArchive:
     identity: ${GIT_DEPLOY_IDENTITY}
     url: ${GIT_DEPLOY_URL}

go.mod

@@ -31,6 +31,8 @@ require (
 	sigs.k8s.io/yaml v1.4.0
 )
 
+require github.com/swist/go-k8s-portforward v0.2.1
+
 require (
 	contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect
 	contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
@@ -87,11 +89,13 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
+	github.com/moby/spdystream v0.2.0 // indirect
 	github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/nsf/termbox-go v1.1.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect

go.sum

@@ -62,6 +62,7 @@ github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8V
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
 github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/aws/aws-sdk-go v1.54.19 h1:tyWV+07jagrNiCcGRzRhdtVjQs7Vy41NwsuOcl0IbVI=
@@ -374,6 +375,7 @@ github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyex
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8=
 github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
 github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA=
 github.com/moby/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
@@ -391,6 +393,7 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nsf/termbox-go v1.1.1 h1:nksUPLCb73Q++DwbYUBEglYBRPZyoXJdrj5L+TkjyZY=
@@ -512,6 +515,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc=
+github.com/swist/go-k8s-portforward v0.2.1 h1:g05bb6ga8bNMS06SQTsncBl8PYWWw3Xhv/HouuBqXmQ=
+github.com/swist/go-k8s-portforward v0.2.1/go.mod h1:03UIdxC0VkvjjJ2Hp2UenhvZmXVVJfHBBK9GR6Pa1+A=
 github.com/tektoncd/cli v0.37.0 h1:C+1/N+cGwj3ClIH9An2FggoplQ36zID7+5I0q03lrF0=
 github.com/tektoncd/cli v0.37.0/go.mod h1:RageyyvtjqucJ5l0yPInjHCgdyf8Tz7EFZXFjv6ROGQ=
 github.com/tektoncd/pipeline v0.59.2 h1:hspD31XWToUIFnUFkUitjqGBnW0hd9Q9cVHYbhjphi0=

java-components/resource-model/src/main/resources/crds/jvmbuildservice.io_jbsconfigs.yaml

@@ -116,6 +116,8 @@ spec:
                 type: object
               mavenDeployment:
                 properties:
+                  onlyDeploy:
+                    type: boolean
                   repository:
                     type: string
                   username:

openshift-with-appstudio-test/e2e/Dockerfile.reposilite

@@ -0,0 +1,3 @@
+#This file is used to enable renovate to update the digests. It is updated by renovate then substituted into the golang code.
+
+FROM dzikoysk/reposilite:latest@sha256:4ed47bf26fe7a2d1091de09c8647295605ba52a9af7913ca99e8ed8126b49a16