diff --git a/.pipeline/lib/config.js b/.pipeline/lib/config.js index 8ba20ef75..b56c97d97 100644 --- a/.pipeline/lib/config.js +++ b/.pipeline/lib/config.js @@ -57,6 +57,8 @@ const phases = { "https://dev.loginproxy.gov.bc.ca/auth/realms/standard/.well-known/openid-configuration", backendKeycloakCertsUrl: "https://dev.loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/certs", + redisHost: "lcfs-redis-dev-master.d2bd59-dev.svc.cluster.local", + redisPort: 6379, celeryCpuRequest: "100m", celeryCpuLimit: "250m", celeryMemoryRequest: "1600Mi", @@ -133,6 +135,8 @@ const phases = { "https://test.loginproxy.gov.bc.ca/auth/realms/standard/.well-known/openid-configuration", backendKeycloakCertsUrl: "https://test.loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/certs", + redisHost: "lcfs-redis-test-master.d2bd59-test.svc.cluster.local", + redisPort: 6379, celeryCpuRequest: "100m", celeryCpuLimit: "250m", celeryMemoryRequest: "1600Mi", @@ -209,6 +213,8 @@ const phases = { "https://loginproxy.gov.bc.ca/auth/realms/standard/.well-known/openid-configuration", backendKeycloakCertsUrl: "https://loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/certs", + redisHost: "lcfs-redis-prod-master.d2bd59-prod.svc.cluster.local", + redisPort: 6379, celeryCpuRequest: "100m", celeryCpuLimit: "250mm", celeryMemoryRequest: "1600Mi", diff --git a/.pipeline/lib/deploy.js b/.pipeline/lib/deploy.js index bd664a3ed..7a6e47774 100755 --- a/.pipeline/lib/deploy.js +++ b/.pipeline/lib/deploy.js @@ -1,69 +1,90 @@ "use strict"; const { OpenShiftClientX } = require("@bcgov/pipeline-cli"); const path = require("path"); -const KeyCloakClient = require('./keycloak'); +const KeyCloakClient = require("./keycloak"); -module.exports = settings => { +module.exports = (settings) => { const phases = settings.phases; const options = settings.options; const phase = options.env; const changeId = phases[phase].changeId; - const oc = new OpenShiftClientX(Object.assign({ namespace: phases[phase].namespace }, options)); + const oc = new OpenShiftClientX( + Object.assign({ namespace: phases[phase].namespace }, options) + ); - const templatesLocalBaseUrl = oc.toFileUrl(path.resolve(__dirname, "../../openshift-v4")); + const templatesLocalBaseUrl = oc.toFileUrl( + path.resolve(__dirname, "../../openshift-v4") + ); var objects = []; //The deployment of your cool app goes here ▼▼▼ //deploy backend - objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/backend/backend-dc.yaml`, { - 'param': { - 'NAME': phases[phase].name, - 'SUFFIX': phases[phase].suffix, - 'ENV_NAME': phases[phase].phase, - 'NAMESPACE': phases[phase].namespace, - 'VERSION': phases[phase].tag, - 'KEYCLOAK_AUDIENCE': phases[phase].backendKeycloakAudience, - 'CPU_REQUEST':phases[phase].backendCpuRequest, - 'CPU_LIMIT':phases[phase].backendCpuLimit, - 'MEMORY_REQUEST':phases[phase].backendMemoryRequest, - 'MEMORY_LIMIT':phases[phase].backendMemoryLimit, - 'REPLICAS':phases[phase].backendReplicas, - 'DB_SERVICE_NAME':phases[phase].dbServiceName, - 'WELL_KNOWN_ENDPOINT':phases[phase].backendWellKnownEndpoint, - } - })) - - objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/backend/backend-dc-others.yaml`, { - 'param': { - 'NAME': phases[phase].name, - 'SUFFIX': phases[phase].suffix, - 'BACKEND_HOST':phases[phase].backendHost - } - })) + objects = objects.concat( + oc.processDeploymentTemplate( + `${templatesLocalBaseUrl}/templates/backend/backend-dc.yaml`, + { + param: { + NAME: phases[phase].name, + SUFFIX: phases[phase].suffix, + ENV_NAME: phases[phase].phase, + NAMESPACE: phases[phase].namespace, + VERSION: phases[phase].tag, + KEYCLOAK_AUDIENCE: phases[phase].backendKeycloakAudience, + CPU_REQUEST: phases[phase].backendCpuRequest, + CPU_LIMIT: phases[phase].backendCpuLimit, + MEMORY_REQUEST: phases[phase].backendMemoryRequest, + MEMORY_LIMIT: phases[phase].backendMemoryLimit, + REPLICAS: phases[phase].backendReplicas, + DB_SERVICE_NAME: phases[phase].dbServiceName, + WELL_KNOWN_ENDPOINT: phases[phase].backendWellKnownEndpoint, + REDIS_HOST: phases[phase].redistHost, + REDIS_PORT: phases[phase].redisPort, + }, + } + ) + ); + + objects = objects.concat( + oc.processDeploymentTemplate( + `${templatesLocalBaseUrl}/templates/backend/backend-dc-others.yaml`, + { + param: { + NAME: phases[phase].name, + SUFFIX: phases[phase].suffix, + BACKEND_HOST: phases[phase].backendHost, + }, + } + ) + ); //deploy frontend - objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/frontend/frontend-dc-docker.yaml`, { - 'param': { - 'NAME': phases[phase].name, - 'SUFFIX': phases[phase].suffix, - 'VERSION': phases[phase].tag, - 'NAMESPACE': phases[phase].namespace, - 'CPU_REQUEST': phases[phase].frontendCpuRequest, - 'CPU_LIMIT': phases[phase].frontendCpuLimit, - 'MEMORY_REQUEST': phases[phase].frontendMemoryRequest, - 'MEMORY_LIMIT': phases[phase].frontendMemoryLimit, - 'REPLICAS':phases[phase].frontendReplicas, - 'KEYCLOAK_AUTHORITY':phases[phase].frontendKeycloakAuthority, - 'KEYCLOAK_CLIENT_ID':phases[phase].frontendKeycloakClientId, - 'KEYCLOAK_CALLBACK_URL':phases[phase].frontendKeycloakCallbackUrl, - 'KEYCLOAK_LOGOUT_URL':phases[phase].frontendKeycloakLogoutUrl, - 'SITEMINDER_LOGOUT_URL':phases[phase].frontendSiteminderLogoutUrl, - 'BACKEND_HOST':phases[phase].backendHost, - 'DEBUG_ENABLED':phases[phase].frontendDebugEnabled, - } - })) -/* + objects = objects.concat( + oc.processDeploymentTemplate( + `${templatesLocalBaseUrl}/templates/frontend/frontend-dc-docker.yaml`, + { + param: { + NAME: phases[phase].name, + SUFFIX: phases[phase].suffix, + VERSION: phases[phase].tag, + NAMESPACE: phases[phase].namespace, + CPU_REQUEST: phases[phase].frontendCpuRequest, + CPU_LIMIT: phases[phase].frontendCpuLimit, + MEMORY_REQUEST: phases[phase].frontendMemoryRequest, + MEMORY_LIMIT: phases[phase].frontendMemoryLimit, + REPLICAS: phases[phase].frontendReplicas, + KEYCLOAK_AUTHORITY: phases[phase].frontendKeycloakAuthority, + KEYCLOAK_CLIENT_ID: phases[phase].frontendKeycloakClientId, + KEYCLOAK_CALLBACK_URL: phases[phase].frontendKeycloakCallbackUrl, + KEYCLOAK_LOGOUT_URL: phases[phase].frontendKeycloakLogoutUrl, + SITEMINDER_LOGOUT_URL: phases[phase].frontendSiteminderLogoutUrl, + BACKEND_HOST: phases[phase].backendHost, + DEBUG_ENABLED: phases[phase].frontendDebugEnabled, + }, + } + ) + ); + /* //deploy frontend objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/frontend/frontend-dc-docker-others.yaml`, { 'param': { @@ -75,75 +96,100 @@ module.exports = settings => { })) */ //deploy celery - objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/celery/celery-dc.yaml`, { - 'param': { - 'NAME': phases[phase].name, - 'SUFFIX': phases[phase].suffix, - 'VERSION': phases[phase].tag, - 'ENV_NAME': phases[phase].phase, - 'NAMESPACE': phases[phase].namespace, - 'CPU_REQUEST': phases[phase].celeryCpuRequest, - 'CPU_LIMIT': phases[phase].celeryCpuLimit, - 'MEMORY_REQUEST': phases[phase].celeryMemoryRequest, - 'MEMORY_LIMIT': phases[phase].celeryMemoryLimit, - 'DB_SERVICE_NAME':phases[phase].dbServiceName, - } - })) + objects = objects.concat( + oc.processDeploymentTemplate( + `${templatesLocalBaseUrl}/templates/celery/celery-dc.yaml`, + { + param: { + NAME: phases[phase].name, + SUFFIX: phases[phase].suffix, + VERSION: phases[phase].tag, + ENV_NAME: phases[phase].phase, + NAMESPACE: phases[phase].namespace, + CPU_REQUEST: phases[phase].celeryCpuRequest, + CPU_LIMIT: phases[phase].celeryCpuLimit, + MEMORY_REQUEST: phases[phase].celeryMemoryRequest, + MEMORY_LIMIT: phases[phase].celeryMemoryLimit, + DB_SERVICE_NAME: phases[phase].dbServiceName, + }, + } + ) + ); //deploy notification server - objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/notification/notification-server-dc.yaml`, { - 'param': { - 'NAME': phases[phase].name, - 'SUFFIX': phases[phase].suffix, - 'NAMESPACE': phases[phase].namespace, - 'VERSION': phases[phase].tag, - 'KEYCLOAK_CERTS_URL': phases[phase].backendKeycloakCertsUrl, - 'CPU_REQUEST':phases[phase].notificationServerCpuRequest, - 'CPU_LIMIT':phases[phase].notificationServerCpuLimit, - 'MEMORY_REQUEST':phases[phase].notificationServerMemoryRequest, - 'MEMORY_LIMIT':phases[phase].notificationServerMemoryLimit - } - })) + objects = objects.concat( + oc.processDeploymentTemplate( + `${templatesLocalBaseUrl}/templates/notification/notification-server-dc.yaml`, + { + param: { + NAME: phases[phase].name, + SUFFIX: phases[phase].suffix, + NAMESPACE: phases[phase].namespace, + VERSION: phases[phase].tag, + KEYCLOAK_CERTS_URL: phases[phase].backendKeycloakCertsUrl, + CPU_REQUEST: phases[phase].notificationServerCpuRequest, + CPU_LIMIT: phases[phase].notificationServerCpuLimit, + MEMORY_REQUEST: phases[phase].notificationServerMemoryRequest, + MEMORY_LIMIT: phases[phase].notificationServerMemoryLimit, + }, + } + ) + ); - objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/notification/notification-server-others-dc.yaml`, { - 'param': { - 'NAME': phases[phase].name, - 'SUFFIX': phases[phase].suffix, - 'FRONTEND_HOST': phases[phase].frontendHost - } - })) + objects = objects.concat( + oc.processDeploymentTemplate( + `${templatesLocalBaseUrl}/templates/notification/notification-server-others-dc.yaml`, + { + param: { + NAME: phases[phase].name, + SUFFIX: phases[phase].suffix, + FRONTEND_HOST: phases[phase].frontendHost, + }, + } + ) + ); //deploy scan coordinator - objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/scan-coordinator/scan-coordinator-dc.yaml`, { - 'param': { - 'NAME': phases[phase].name, - 'SUFFIX': phases[phase].suffix, - 'NAMESPACE': phases[phase].namespace, - 'VERSION': phases[phase].tag, - 'ENV_NAME': phases[phase].phase, - 'CPU_REQUEST':phases[phase].scanCoordinatorCpuRequest, - 'CPU_LIMIT':phases[phase].scanCoordinatorCpuLimit, - 'MEMORY_REQUEST':phases[phase].scanCoordinatorMemoryRequest, - 'MEMORY_LIMIT':phases[phase].scanCoordinatorMemoryLimit - } - })) + objects = objects.concat( + oc.processDeploymentTemplate( + `${templatesLocalBaseUrl}/templates/scan-coordinator/scan-coordinator-dc.yaml`, + { + param: { + NAME: phases[phase].name, + SUFFIX: phases[phase].suffix, + NAMESPACE: phases[phase].namespace, + VERSION: phases[phase].tag, + ENV_NAME: phases[phase].phase, + CPU_REQUEST: phases[phase].scanCoordinatorCpuRequest, + CPU_LIMIT: phases[phase].scanCoordinatorCpuLimit, + MEMORY_REQUEST: phases[phase].scanCoordinatorMemoryRequest, + MEMORY_LIMIT: phases[phase].scanCoordinatorMemoryLimit, + }, + } + ) + ); //deploy scan handler - objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/scan-handler/scan-handler-dc.yaml`, { - 'param': { - 'NAME': phases[phase].name, - 'SUFFIX': phases[phase].suffix, - 'NAMESPACE': phases[phase].namespace, - 'VERSION': phases[phase].tag, - 'CPU_REQUEST':phases[phase].scanHandlerCpuRequest, - 'CPU_LIMIT':phases[phase].scanHandlerCpuLimit, - 'MEMORY_REQUEST':phases[phase].scanHandlerMemoryRequest, - 'MEMORY_LIMIT':phases[phase].scanHandlerMemoryLimit, - 'DB_SERVICE_NAME':phases[phase].dbServiceName, - } - })) + objects = objects.concat( + oc.processDeploymentTemplate( + `${templatesLocalBaseUrl}/templates/scan-handler/scan-handler-dc.yaml`, + { + param: { + NAME: phases[phase].name, + SUFFIX: phases[phase].suffix, + NAMESPACE: phases[phase].namespace, + VERSION: phases[phase].tag, + CPU_REQUEST: phases[phase].scanHandlerCpuRequest, + CPU_LIMIT: phases[phase].scanHandlerCpuLimit, + MEMORY_REQUEST: phases[phase].scanHandlerMemoryRequest, + MEMORY_LIMIT: phases[phase].scanHandlerMemoryLimit, + DB_SERVICE_NAME: phases[phase].dbServiceName, + }, + } + ) + ); -/* + /* //only deploy on dev for Tracking PR if(phases[phase].phase === 'dev') { @@ -195,8 +241,13 @@ module.exports = settings => { phases[phase].name, phase, `${changeId}`, - phases[phase].instance, + phases[phase].instance + ); + oc.importImageStreams( + objects, + phases[phase].tag, + phases.build.namespace, + phases.build.tag ); - oc.importImageStreams(objects, phases[phase].tag, phases.build.namespace, phases.build.tag); oc.applyAndDeploy(objects, phases[phase].instance); }; diff --git a/backend/sonar-runner/README.md b/backend/sonar-runner/README.md deleted file mode 100644 index 9c7009700..000000000 --- a/backend/sonar-runner/README.md +++ /dev/null @@ -1,12 +0,0 @@ -This example demonstrates how to analyze a simple Java project with Gradle. - -Prerequisites -============= -* [SonarQube](http://www.sonarqube.org/downloads/) 4.5+ -* [Gradle](http://www.gradle.org/) 2.1 or higher - -Usage -===== -* Analyze the project with SonarQube using Gradle: - - gradle sonarqube [-Dsonar.host.url=... -Dsonar.jdbc.url=... -Dsonar.jdbc.username=... -Dsonar.jdbc.password=...] diff --git a/backend/sonar-runner/build.gradle b/backend/sonar-runner/build.gradle deleted file mode 100644 index 5c8a02deb..000000000 --- a/backend/sonar-runner/build.gradle +++ /dev/null @@ -1,53 +0,0 @@ -// Uses DSL plugins resolution introduced in Gradle 2.1 -plugins { - id "java" - id "jacoco" - id "org.sonarqube" version "2.6.1" -} - -sonarqube { - properties { - property "sonar.projectName", "Transportation Fuels Reporting System - Backend" - property "sonar.projectKey", "tfrs-backend" - property "sonar.projectBaseDir", ".." - property "sonar.sources", "api" - property "sonar.language", "py" - property "sonar.sourceEncoding", "UTF-8" - property "sonar.python.xunit.reportPath","nosetests.xml" - property "sonar.python.coverage.reportPath","coverage.xml" - property "sonar.python.coveragePlugin","cobertura" - property "sonar.jacoco.reportPath", "${project.buildDir}/jacoco/test.exec" - - } -} - -allprojects { - def env = System.getenv() - TimeZone.getTimeZone('UTC') - Date date= new Date() - String newdate=date.format("YYYYMMdd") - ext.baseVersion = newdate + "." + env['BUILD_NUMBER'] - ext.snapshotVersion = false - - group = "org.sonarqube" - version = "$baseVersion" + (snapshotVersion ? "-SNAPSHOT" : "") -} - -test { - ignoreFailures = true -} - -dependencies { - testCompile 'junit:junit:4.12' -} - -repositories { - repositories { - maven { - url "http://repo1.maven.org/maven2/" - } - maven { - url "https://plugins.gradle.org/m2/" - } - } -} diff --git a/backend/sonar-runner/gradle.properties b/backend/sonar-runner/gradle.properties deleted file mode 100644 index c72d51aa6..000000000 --- a/backend/sonar-runner/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -org.gradle.daemon=false -org.gradle.workers.max=4 diff --git a/backend/sonar-runner/gradle/wrapper/gradle-wrapper.jar b/backend/sonar-runner/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 6ffa23784..000000000 Binary files a/backend/sonar-runner/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/backend/sonar-runner/gradle/wrapper/gradle-wrapper.properties b/backend/sonar-runner/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index a2e5c9137..000000000 --- a/backend/sonar-runner/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Tue Sep 20 22:02:53 BST 2016 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip diff --git a/backend/sonar-runner/gradlew b/backend/sonar-runner/gradlew deleted file mode 100755 index 9aa616c27..000000000 --- a/backend/sonar-runner/gradlew +++ /dev/null @@ -1,169 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/backend/sonar-runner/gradlew.bat b/backend/sonar-runner/gradlew.bat deleted file mode 100755 index e95643d6a..000000000 --- a/backend/sonar-runner/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/openshift-v4/templates/backend/backend-dc.yaml b/openshift-v4/templates/backend/backend-dc.yaml index 97bf8c295..54cc519ff 100644 --- a/openshift-v4/templates/backend/backend-dc.yaml +++ b/openshift-v4/templates/backend/backend-dc.yaml @@ -212,6 +212,15 @@ objects: value: "${KEYCLOAK_AUDIENCE}" - name: WELL_KNOWN_ENDPOINT value: "${WELL_KNOWN_ENDPOINT}" + - name: REDIS_HOST + value: "${REDIS_HOST}" + - name: REDIS_PORT + value: "${REDIS_PORT}" + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: lcfs-redis-${ENV_NAME}-connection + key: redis-password resources: limits: cpu: "${CPU_LIMIT}"