From 983a33c271a288a346df4b2432de40a6fbd2f7b5 Mon Sep 17 00:00:00 2001 From: Sanjeev Thatiparthi <54054932+sanopsmx@users.noreply.github.com> Date: Wed, 10 Jan 2024 13:21:31 +0530 Subject: [PATCH 01/21] Fixed awss3 profile application not starting issue. OP-21583 (#76) --- clouddriver-appengine/clouddriver-appengine.gradle | 2 ++ clouddriver-cloudrun/clouddriver-cloudrun.gradle | 2 ++ clouddriver-configserver/clouddriver-configserver.gradle | 2 ++ clouddriver-google/clouddriver-google.gradle | 2 ++ clouddriver-kubernetes/clouddriver-kubernetes.gradle | 2 ++ 5 files changed, 10 insertions(+) diff --git a/clouddriver-appengine/clouddriver-appengine.gradle b/clouddriver-appengine/clouddriver-appengine.gradle index 3b6d74de46f..9e75bd8b607 100644 --- a/clouddriver-appengine/clouddriver-appengine.gradle +++ b/clouddriver-appengine/clouddriver-appengine.gradle @@ -33,6 +33,8 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-web" implementation "org.springframework.cloud:spring-cloud-context" implementation "org.springframework.cloud:spring-cloud-config-server" + implementation "software.amazon.awssdk:s3:2.22.12" + implementation "software.amazon.awssdk:secretsmanager:2.22.12" implementation "com.jcraft:jsch:0.1.55" implementation("org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:6.4.0.202211300538-r")//:5.12.0.202106070339-r") /* implementation("com.jcraft:jsch.agentproxy.connector-factory:0.0.9") diff --git a/clouddriver-cloudrun/clouddriver-cloudrun.gradle b/clouddriver-cloudrun/clouddriver-cloudrun.gradle index cd80d5031b8..e0bdd6211bd 100644 --- a/clouddriver-cloudrun/clouddriver-cloudrun.gradle +++ b/clouddriver-cloudrun/clouddriver-cloudrun.gradle @@ -33,6 +33,8 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-web" implementation "org.springframework.cloud:spring-cloud-context" implementation "org.springframework.cloud:spring-cloud-config-server" + implementation "software.amazon.awssdk:s3:2.22.12" + implementation "software.amazon.awssdk:secretsmanager:2.22.12" testImplementation "org.assertj:assertj-core" testImplementation "cglib:cglib-nodep:3.3.0" diff --git a/clouddriver-configserver/clouddriver-configserver.gradle b/clouddriver-configserver/clouddriver-configserver.gradle index ef3df40bf31..cd47aa7d13e 100644 --- a/clouddriver-configserver/clouddriver-configserver.gradle +++ b/clouddriver-configserver/clouddriver-configserver.gradle @@ -20,6 +20,8 @@ dependencies { implementation "org.apache.commons:commons-lang3" implementation "org.springframework.cloud:spring-cloud-context" implementation "org.springframework.cloud:spring-cloud-config-server" + implementation "software.amazon.awssdk:s3:2.22.12" + implementation "software.amazon.awssdk:secretsmanager:2.22.12" implementation "com.github.wnameless.json:json-flattener:0.14.2" } diff --git a/clouddriver-google/clouddriver-google.gradle b/clouddriver-google/clouddriver-google.gradle index 2940913cf1d..34a9f3522c3 100644 --- a/clouddriver-google/clouddriver-google.gradle +++ b/clouddriver-google/clouddriver-google.gradle @@ -34,6 +34,8 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-web" implementation "org.springframework.cloud:spring-cloud-context" implementation "org.springframework.cloud:spring-cloud-config-server" + implementation "software.amazon.awssdk:s3:2.22.12" + implementation "software.amazon.awssdk:secretsmanager:2.22.12" testImplementation "org.assertj:assertj-core" testImplementation "cglib:cglib-nodep:3.3.0" diff --git a/clouddriver-kubernetes/clouddriver-kubernetes.gradle b/clouddriver-kubernetes/clouddriver-kubernetes.gradle index ab16227fb69..9ea2062a02e 100644 --- a/clouddriver-kubernetes/clouddriver-kubernetes.gradle +++ b/clouddriver-kubernetes/clouddriver-kubernetes.gradle @@ -95,6 +95,8 @@ dependencies { implementation "org.springframework.security:spring-security-config" implementation "org.springframework.cloud:spring-cloud-context" implementation "org.springframework.cloud:spring-cloud-config-server" + implementation "software.amazon.awssdk:s3:2.22.12" + implementation "software.amazon.awssdk:secretsmanager:2.22.12" implementation "io.github.resilience4j:resilience4j-retry" implementation "io.github.resilience4j:resilience4j-micrometer" implementation "joda-time:joda-time:2.12.5" From 42620c742ae0c1c7d77c892af8dce03edff53954 Mon Sep 17 00:00:00 2001 From: yugaa22 Date: Fri, 12 Jan 2024 11:24:56 +0530 Subject: [PATCH 02/21] nov release with s3 fix --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9b779d5dbfa..48fee9282f3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ fiatVersion=1-0-SNAPSHOT -korkVersion=1-0-SNAPSHOT +korkVersion=1-9-SNAPSHOT org.gradle.parallel=true spinnakerGradleVersion=1-0-SNAPSHOT #targetJava11=true From 824ca0268d081baf70edca0031f539b2aca79b12 Mon Sep 17 00:00:00 2001 From: yugaa22 Date: Fri, 12 Jan 2024 11:30:48 +0530 Subject: [PATCH 03/21] github action updation --- .github/workflows/clouddriver-oes.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/clouddriver-oes.yml b/.github/workflows/clouddriver-oes.yml index 1b0561ee7b5..49a1d177ca1 100644 --- a/.github/workflows/clouddriver-oes.yml +++ b/.github/workflows/clouddriver-oes.yml @@ -2,9 +2,10 @@ name: Branch Build clouddriver on: workflow_call: + workflow_dispatch: push: branches: - - OES-1.30.1 + - OES-1.30.1-nov-cve env: GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx6g -Xms6g From 17f3ad9057ae73923020f7e37c1e0401488d2477 Mon Sep 17 00:00:00 2001 From: Yugandharkumar Date: Wed, 17 Jan 2024 13:10:07 +0530 Subject: [PATCH 04/21] Update Dockerfile-dev --- docker/ubi8/Dockerfile-dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/ubi8/Dockerfile-dev b/docker/ubi8/Dockerfile-dev index 3d1524e0f43..b14590d038c 100644 --- a/docker/ubi8/Dockerfile-dev +++ b/docker/ubi8/Dockerfile-dev @@ -81,7 +81,7 @@ RUN wget https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_RE && mv ./aws-iam-authenticator /usr/local/bin/aws-iam-authenticator\ && ln -sf /usr/local/bin/aws-iam-authenticator /usr/local/bin/heptio-authenticator-aws -#COPY clouddriver-web/build/install/clouddriver /opt/clouddriver +COPY clouddriver-web/build/install/clouddriver /opt/clouddriver RUN mkdir -p /opt/jaeger COPY jaeger/opentelemetry-javaagent.jar /opt/jaeger/opentelemetry-javaagent.jar From dde98b85675b274ae1619df86e5aea4b0485efb1 Mon Sep 17 00:00:00 2001 From: Yugandharkumar Date: Wed, 24 Jan 2024 14:05:47 +0530 Subject: [PATCH 05/21] Create gradle-build-dockerfile --- docker/ubi/gradle-build-dockerfile | 130 +++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 docker/ubi/gradle-build-dockerfile diff --git a/docker/ubi/gradle-build-dockerfile b/docker/ubi/gradle-build-dockerfile new file mode 100644 index 00000000000..c25f1e45fa4 --- /dev/null +++ b/docker/ubi/gradle-build-dockerfile @@ -0,0 +1,130 @@ +FROM gradle:latest AS BUILD +COPY . . +RUN ./gradlew --no-daemon clouddriver-web:installDist -x test + +FROM registry.access.redhat.com/ubi8/ubi:8.8 as java-builder +LABEL maintainer="OpsMx" + +ARG JAVA_PACKAGE=java-17-openjdk-jmods +RUN yum -y update && yum -y install --nodocs ${JAVA_PACKAGE} + +# Build a custom JRE. +# For now, we will include all modules. We could try to remove the ones +# we don't need to reduce image size and security attack surface. +WORKDIR /jrebuild +RUN java --list-modules | cut -d'@' -f1 > modules +RUN jlink --output runtime --add-modules `paste -sd, - < modules` --compress 2 --vm server + +# Build a minimal base image with our custom Java installed. + +FROM registry.access.redhat.com/ubi8/ubi:8.8 AS awscli-install +RUN yum install -y unzip +RUN curl https://awscli.amazonaws.com/awscli-exe-linux-`uname -m`.zip -o awscliv2.zip +RUN unzip awscliv2.zip +RUN ./aws/install + +FROM registry.access.redhat.com/ubi8/ubi:8.8 AS java-base +LABEL maintainer="OpsMx" +COPY --from=java-builder /jrebuild/runtime /opsmx-java-runtime +COPY --from=awscli-install /usr/local/aws-cli /usr/local/aws-cli/ +RUN ln -sf /usr/local/aws-cli/v2/current/bin/aws /usr/local/bin/aws && ln -sf /usr/local/aws-cli/v2/current/bin/aws_completer /usr/local/bin/aws_completer +ARG OPSMXUSER=1001 +ENV JAVA_HOME=/opsmx-java-runtime \ + PATH=${PATH}:/opsmx-java-runtime/bin \ + WORK_DIR=/opsmx/workdir \ + CONF_DIR=/opsmx/conf + +# Enabling fips mode +RUN fips-mode-setup --enable + +# Setting crypto policies to FIPS +RUN update-crypto-policies --set FIPS + +RUN yum install -y python38 +ARG TARGETARCH + + +ENV KUBECTL_RELEASE=1.22.0 +ENV AWS_CLI_S3_CMD=2.0.2 +ENV AWS_AIM_AUTHENTICATOR_VERSION=0.6.14 +ENV GOOGLE_CLOUD_SDK_VERSION=458.0.1 +ENV ECR_TOKEN_VERSION=v1.0.2 + +ENV PATH "$PATH:/usr/local/bin/:/opt/google-cloud-sdk/bin/:/usr/local/bin/aws-iam-authenticator" + +USER root + + +#RUN yum -y install bash jq tar unzip wget procps java-17-openjdk-devel.x86_64 vim net-tools curl git + +RUN yum -y install wget git + + +# AWS CLI +RUN yum -y install python3-pip && \ + pip3 install --upgrade pyyaml==5.4 s3cmd==${AWS_CLI_S3_CMD} python-magic \ + && yum -y remove python3-pip && \ + yum clean all + + +RUN wget -nv https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GOOGLE_CLOUD_SDK_VERSION}-linux-x86_64.tar.gz \ + && mkdir -p /opt \ + && tar -xzf google-cloud-sdk-${GOOGLE_CLOUD_SDK_VERSION}-linux-x86_64.tar.gz -C /opt \ + && rm google-cloud-sdk-${GOOGLE_CLOUD_SDK_VERSION}-linux-x86_64.tar.gz \ + && CLOUDSDK_PYTHON="python3" /opt/google-cloud-sdk/install.sh --usage-reporting=false --bash-completion=false \ + --additional-components app-engine-java app-engine-go gke-gcloud-auth-plugin \ + && rm -rf ~/.config/gcloud \ + && rm -rf /opt/google-cloud-sdk/.install/.backup + +# kubectl + AWS IAM authenticator +RUN wget https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_RELEASE}/bin/linux/${TARGETARCH}/kubectl \ + && chmod +x kubectl \ + && mv ./kubectl /usr/local/bin/kubectl \ + && wget -O aws-iam-authenticator https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/download/v${AWS_AIM_AUTHENTICATOR_VERSION}/aws-iam-authenticator_${AWS_AIM_AUTHENTICATOR_VERSION}_linux_${TARGETARCH} \ + && chmod +x ./aws-iam-authenticator \ + && mv ./aws-iam-authenticator /usr/local/bin/aws-iam-authenticator\ + && ln -sf /usr/local/bin/aws-iam-authenticator /usr/local/bin/heptio-authenticator-aws + + +COPY --from=BUILD clouddriver-web/build/install/clouddriver /opt/clouddriver + + +RUN mkdir -p /opt/jaeger +COPY jaeger/opentelemetry-javaagent.jar /opt/jaeger/opentelemetry-javaagent.jar + +#RUN yum -y remove tar curl +#RUN yum -y remove vim jq unzip +RUN yum -y remove clean all && rm -rf /var/cache + + + +RUN adduser spinnaker +RUN mkdir -p /opt/clouddriver/plugins + +#custom plugin zip files adding +#ARG CUSTOMPLUGIN_RELEASEVERSION +#ENV CUSTOMPLUGIN_RELEASEVERSION=$CUSTOMPLUGIN_RELEASEVERSION + +ARG CUSTOMPLUGIN_RELEASEORG +ENV CUSTOMPLUGIN_RELEASEORG=$CUSTOMPLUGIN_RELEASEORG + +ARG CUSTOMPLUGIN_RELEASEREPO +ENV CUSTOMPLUGIN_RELEASEREPO=$CUSTOMPLUGIN_RELEASEREPO + +ARG CUSTOMPLUGIN_RELEASEVERSION +ENV CUSTOMPLUGIN_RELEASEVERSION=$CUSTOMPLUGIN_RELEASEVERSION + +RUN wget -O Armory.armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}-SNAPSHOT.zip -c https://github.com/${CUSTOMPLUGIN_RELEASEORG}/${CUSTOMPLUGIN_RELEASEREPO}/releases/download/${CUSTOMPLUGIN_RELEASEVERSION}/armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}.zip -P /opt/clouddriver/plugins + +RUN mv Armory.armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}-SNAPSHOT.zip /opt/clouddriver/plugins/ + +RUN chmod -R 777 /opt/clouddriver/plugins/ +RUN chown -R spinnaker:spinnaker /opt/ + +RUN mkdir -p /etc/pki/tls/certs +RUN chmod -R 777 /etc/pki/tls/certs +RUN chmod -R 777 /var/ +RUN chown -R spinnaker:spinnaker /var +USER spinnaker +ENV SLEEP_TIME=10s +CMD sleep $SLEEP_TIME ; "/opt/clouddriver/bin/clouddriver" From c8aeb5dee73f3c2e9d414212ac7ca3798f8445ad Mon Sep 17 00:00:00 2001 From: Yugandharkumar Date: Wed, 24 Jan 2024 14:08:45 +0530 Subject: [PATCH 06/21] Update clouddriver-oes.yml --- .github/workflows/clouddriver-oes.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/clouddriver-oes.yml b/.github/workflows/clouddriver-oes.yml index 49a1d177ca1..11906b9411e 100644 --- a/.github/workflows/clouddriver-oes.yml +++ b/.github/workflows/clouddriver-oes.yml @@ -51,24 +51,24 @@ jobs: sed -e 's/NEXUS_USERNAME/${{ secrets.NEXUS_USERNAME }}/' -i build.gradle sed -e 's/NEXUS_PASSWORD/${{ secrets.NEXUS_PASSWORD }}/' -i build.gradle - ./gradlew --no-daemon -PenableCrossCompilerPlugin=true clouddriver-web:installDist -x test + #./gradlew --no-daemon -PenableCrossCompilerPlugin=true clouddriver-web:installDist -x test #./gradlew --no-daemon clouddriver-web:installDist -x test #extra_opts='"--add-opens=java.base/sun.net=ALL-UNNAMED" "--add-exports=java.base/sun.net=ALL-UNNAMED" "--add-opens=java.base/java.time=ALL-UNNAMED"' - extra_opts='"-Djava.security.egd=file:/dev/./urandom" "-Dspring.config.import=optional:/opt/spinnaker/config/" "--add-opens=java.base/sun.net=ALL-UNNAMED" "--add-exports=java.base/sun.net=ALL-UNNAMED" "--add-opens=java.base/java.time=ALL-UNNAMED" "--add-exports=java.base/sun.security.rsa=ALL-UNNAMED" "--add-exports=java.base/sun.security.pkcs=ALL-UNNAMED" "--add-exports=java.base/sun.security.x509=ALL-UNNAMED"' + #extra_opts='"-Djava.security.egd=file:/dev/./urandom" "-Dspring.config.import=optional:/opt/spinnaker/config/" "--add-opens=java.base/sun.net=ALL-UNNAMED" "--add-exports=java.base/sun.net=ALL-UNNAMED" "--add-opens=java.base/java.time=ALL-UNNAMED" "--add-exports=java.base/sun.security.rsa=ALL-UNNAMED" "--add-exports=java.base/sun.security.pkcs=ALL-UNNAMED" "--add-exports=java.base/sun.security.x509=ALL-UNNAMED"' - extra_opts_escaped=$(sed 's/[\/&]/\\&/g' <<< "$extra_opts") + #extra_opts_escaped=$(sed 's/[\/&]/\\&/g' <<< "$extra_opts") - echo $extra_opts_escaped + #echo $extra_opts_escaped #sed "s/^\(DEFAULT_JVM_OPTS=\'.*\)\'$/\1 $extra_opts_escaped\'/" -i clouddriver-web/build/install/clouddriver/bin/clouddriver - sed "s/^\(DEFAULT_JVM_OPTS\)\s*=\s*'.*'\$/\1='$extra_opts_escaped'/" -i clouddriver-web/build/install/clouddriver/bin/clouddriver + # sed "s/^\(DEFAULT_JVM_OPTS\)\s*=\s*'.*'\$/\1='$extra_opts_escaped'/" -i clouddriver-web/build/install/clouddriver/bin/clouddriver - cat clouddriver-web/build/install/clouddriver/bin/clouddriver + # cat clouddriver-web/build/install/clouddriver/bin/clouddriver - name: dockerBuildpush uses: docker/build-push-action@v2 @@ -79,7 +79,7 @@ jobs: CUSTOMPLUGIN_RELEASEORG=opsmx CUSTOMPLUGIN_RELEASEREPO=armory-observability-plugin CUSTOMPLUGIN_RELEASEVERSION=v1.0.1 - file: docker/ubi8/Dockerfile-fips + file: docker/ubi8/gradle-build-dockerfile push: true tags: | "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}" From 79d3e6fd17c41d6aa5cd962ad0e6a9b8030c499f Mon Sep 17 00:00:00 2001 From: Yugandharkumar Date: Wed, 24 Jan 2024 14:10:19 +0530 Subject: [PATCH 07/21] Update and rename gradle-build-dockerfile to gradle-build-dockerfile --- docker/{ubi => ubi8}/gradle-build-dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) rename docker/{ubi => ubi8}/gradle-build-dockerfile (89%) diff --git a/docker/ubi/gradle-build-dockerfile b/docker/ubi8/gradle-build-dockerfile similarity index 89% rename from docker/ubi/gradle-build-dockerfile rename to docker/ubi8/gradle-build-dockerfile index c25f1e45fa4..bc19c153235 100644 --- a/docker/ubi/gradle-build-dockerfile +++ b/docker/ubi8/gradle-build-dockerfile @@ -2,6 +2,12 @@ FROM gradle:latest AS BUILD COPY . . RUN ./gradlew --no-daemon clouddriver-web:installDist -x test +# Modify DEFAULT_JVM_OPTS in clouddriver/bin/clouddriver +ENV EXTRA_OPTS="-Djava.security.egd=file:/dev/./urandom -Dspring.config.import=optional:/opt/spinnaker/config/ --add-opens=java.base/sun.net=ALL-UNNAMED --add-exports=java.base/sun.net=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-exports=java.base/sun.security.rsa=ALL-UNNAMED --add-exports=java.base/sun.security.pkcs=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED" + +RUN sed -i "s/^\(DEFAULT_JVM_OPTS\)\s*=\s*'.*'\$/\1='$EXTRA_OPTS'/" /opt/clouddriver/bin/clouddriver + + FROM registry.access.redhat.com/ubi8/ubi:8.8 as java-builder LABEL maintainer="OpsMx" From 08886223afdd8f7ceb5d81220d2b42364562ede4 Mon Sep 17 00:00:00 2001 From: Yugandharkumar Date: Wed, 24 Jan 2024 14:25:35 +0530 Subject: [PATCH 08/21] Update gradle-build-dockerfile --- docker/ubi8/gradle-build-dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/ubi8/gradle-build-dockerfile b/docker/ubi8/gradle-build-dockerfile index bc19c153235..f8fbf4b7d96 100644 --- a/docker/ubi8/gradle-build-dockerfile +++ b/docker/ubi8/gradle-build-dockerfile @@ -5,7 +5,7 @@ RUN ./gradlew --no-daemon clouddriver-web:installDist -x test # Modify DEFAULT_JVM_OPTS in clouddriver/bin/clouddriver ENV EXTRA_OPTS="-Djava.security.egd=file:/dev/./urandom -Dspring.config.import=optional:/opt/spinnaker/config/ --add-opens=java.base/sun.net=ALL-UNNAMED --add-exports=java.base/sun.net=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-exports=java.base/sun.security.rsa=ALL-UNNAMED --add-exports=java.base/sun.security.pkcs=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED" -RUN sed -i "s/^\(DEFAULT_JVM_OPTS\)\s*=\s*'.*'\$/\1='$EXTRA_OPTS'/" /opt/clouddriver/bin/clouddriver +RUN sed -i "s#^\(DEFAULT_JVM_OPTS\)\s*=\s*'.*'\$#\1='-Djava.security.egd=file:/dev/./urandom -Dspring.config.import=optional:/opt/spinnaker/config/ --add-opens=java.base/sun.net=ALL-UNNAMED --add-exports=java.base/sun.net=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-exports=java.base/sun.security.rsa=ALL-UNNAMED --add-exports=java.base/sun.security.pkcs=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED'#" /opt/clouddriver/bin/clouddriver FROM registry.access.redhat.com/ubi8/ubi:8.8 as java-builder From 97c06482d3a99a4c31b4ecef25c78e073a4d86fb Mon Sep 17 00:00:00 2001 From: Yugandharkumar Date: Wed, 24 Jan 2024 14:34:19 +0530 Subject: [PATCH 09/21] Update gradle-build-dockerfile --- docker/ubi8/gradle-build-dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/ubi8/gradle-build-dockerfile b/docker/ubi8/gradle-build-dockerfile index f8fbf4b7d96..7faa0f26acc 100644 --- a/docker/ubi8/gradle-build-dockerfile +++ b/docker/ubi8/gradle-build-dockerfile @@ -2,10 +2,11 @@ FROM gradle:latest AS BUILD COPY . . RUN ./gradlew --no-daemon clouddriver-web:installDist -x test + # Modify DEFAULT_JVM_OPTS in clouddriver/bin/clouddriver -ENV EXTRA_OPTS="-Djava.security.egd=file:/dev/./urandom -Dspring.config.import=optional:/opt/spinnaker/config/ --add-opens=java.base/sun.net=ALL-UNNAMED --add-exports=java.base/sun.net=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-exports=java.base/sun.security.rsa=ALL-UNNAMED --add-exports=java.base/sun.security.pkcs=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED" +#ENV EXTRA_OPTS="-Djava.security.egd=file:/dev/./urandom -Dspring.config.import=optional:/opt/spinnaker/config/ --add-opens=java.base/sun.net=ALL-UNNAMED --add-exports=java.base/sun.net=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-exports=java.base/sun.security.rsa=ALL-UNNAMED --add-exports=java.base/sun.security.pkcs=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED" -RUN sed -i "s#^\(DEFAULT_JVM_OPTS\)\s*=\s*'.*'\$#\1='-Djava.security.egd=file:/dev/./urandom -Dspring.config.import=optional:/opt/spinnaker/config/ --add-opens=java.base/sun.net=ALL-UNNAMED --add-exports=java.base/sun.net=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-exports=java.base/sun.security.rsa=ALL-UNNAMED --add-exports=java.base/sun.security.pkcs=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED'#" /opt/clouddriver/bin/clouddriver +#RUN sed -i "s#^\(DEFAULT_JVM_OPTS\)\s*=\s*'.*'\$#\1='-Djava.security.egd=file:/dev/./urandom -Dspring.config.import=optional:/opt/spinnaker/config/ --add-opens=java.base/sun.net=ALL-UNNAMED --add-exports=java.base/sun.net=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-exports=java.base/sun.security.rsa=ALL-UNNAMED --add-exports=java.base/sun.security.pkcs=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED'#" /opt/clouddriver/bin/clouddriver FROM registry.access.redhat.com/ubi8/ubi:8.8 as java-builder From 0365f59e985026fb3e4f457de30618c4efd334f0 Mon Sep 17 00:00:00 2001 From: Yugandharkumar Date: Wed, 24 Jan 2024 19:02:25 +0530 Subject: [PATCH 10/21] Update gradle-build-dockerfile --- docker/ubi8/gradle-build-dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/ubi8/gradle-build-dockerfile b/docker/ubi8/gradle-build-dockerfile index 7faa0f26acc..e7b3b37eea0 100644 --- a/docker/ubi8/gradle-build-dockerfile +++ b/docker/ubi8/gradle-build-dockerfile @@ -1,4 +1,5 @@ FROM gradle:latest AS BUILD +WORKDIR /opsmx/clouddriver/ COPY . . RUN ./gradlew --no-daemon clouddriver-web:installDist -x test @@ -93,7 +94,9 @@ RUN wget https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_RE && ln -sf /usr/local/bin/aws-iam-authenticator /usr/local/bin/heptio-authenticator-aws -COPY --from=BUILD clouddriver-web/build/install/clouddriver /opt/clouddriver +ENV APP_HOME=/opsmx/clouddriver/ +WORKDIR $APP_HOME +COPY --from=BUILD $APP_HOME/clouddriver-web/build/install/clouddriver /opt/clouddriver RUN mkdir -p /opt/jaeger From 8720b869ae6252785c6dbf478107aeac06efd27e Mon Sep 17 00:00:00 2001 From: Sanjeev Thatiparthi <54054932+sanopsmx@users.noreply.github.com> Date: Wed, 31 Jan 2024 15:12:25 +0530 Subject: [PATCH 11/21] Temp fix to check if aws & ecs accounts are fetched.We are seeing few issues with aws & ecs accounts. (#77) --- .../groovy/com/netflix/spinnaker/config/AwsConfiguration.groovy | 1 - .../java/com/netflix/spinnaker/config/EcsConfiguration.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/config/AwsConfiguration.groovy b/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/config/AwsConfiguration.groovy index 2758050964d..b08537173ef 100644 --- a/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/config/AwsConfiguration.groovy +++ b/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/config/AwsConfiguration.groovy @@ -66,7 +66,6 @@ import org.springframework.core.Ordered import org.springframework.core.annotation.Order @Configuration -@ConditionalOnProperty('aws.enabled') @ComponentScan(["com.netflix.spinnaker.clouddriver.aws"]) @EnableConfigurationProperties(AwsConfigurationProperties) @Import([ diff --git a/clouddriver-ecs/src/main/java/com/netflix/spinnaker/config/EcsConfiguration.java b/clouddriver-ecs/src/main/java/com/netflix/spinnaker/config/EcsConfiguration.java index 80a203662d0..4d0849735eb 100644 --- a/clouddriver-ecs/src/main/java/com/netflix/spinnaker/config/EcsConfiguration.java +++ b/clouddriver-ecs/src/main/java/com/netflix/spinnaker/config/EcsConfiguration.java @@ -16,11 +16,9 @@ package com.netflix.spinnaker.config; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @Configuration @ComponentScan("com.netflix.spinnaker.clouddriver.ecs") -@ConditionalOnProperty("ecs.enabled") public class EcsConfiguration {} From 7571d71c5528c933b780a3ebba4624c3ba2a1a11 Mon Sep 17 00:00:00 2001 From: Yugandharkumar Date: Wed, 31 Jan 2024 17:05:56 +0530 Subject: [PATCH 12/21] Update clouddriver-oes.yml --- .github/workflows/clouddriver-oes.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/clouddriver-oes.yml b/.github/workflows/clouddriver-oes.yml index 11906b9411e..923d5e3868e 100644 --- a/.github/workflows/clouddriver-oes.yml +++ b/.github/workflows/clouddriver-oes.yml @@ -51,22 +51,22 @@ jobs: sed -e 's/NEXUS_USERNAME/${{ secrets.NEXUS_USERNAME }}/' -i build.gradle sed -e 's/NEXUS_PASSWORD/${{ secrets.NEXUS_PASSWORD }}/' -i build.gradle - #./gradlew --no-daemon -PenableCrossCompilerPlugin=true clouddriver-web:installDist -x test + ./gradlew --no-daemon -PenableCrossCompilerPlugin=true clouddriver-web:installDist -x test #./gradlew --no-daemon clouddriver-web:installDist -x test - #extra_opts='"--add-opens=java.base/sun.net=ALL-UNNAMED" "--add-exports=java.base/sun.net=ALL-UNNAMED" "--add-opens=java.base/java.time=ALL-UNNAMED"' + extra_opts='"--add-opens=java.base/sun.net=ALL-UNNAMED" "--add-exports=java.base/sun.net=ALL-UNNAMED" "--add-opens=java.base/java.time=ALL-UNNAMED"' - #extra_opts='"-Djava.security.egd=file:/dev/./urandom" "-Dspring.config.import=optional:/opt/spinnaker/config/" "--add-opens=java.base/sun.net=ALL-UNNAMED" "--add-exports=java.base/sun.net=ALL-UNNAMED" "--add-opens=java.base/java.time=ALL-UNNAMED" "--add-exports=java.base/sun.security.rsa=ALL-UNNAMED" "--add-exports=java.base/sun.security.pkcs=ALL-UNNAMED" "--add-exports=java.base/sun.security.x509=ALL-UNNAMED"' + extra_opts='"-Djava.security.egd=file:/dev/./urandom" "-Dspring.config.import=optional:/opt/spinnaker/config/" "--add-opens=java.base/sun.net=ALL-UNNAMED" "--add-exports=java.base/sun.net=ALL-UNNAMED" "--add-opens=java.base/java.time=ALL-UNNAMED" "--add-exports=java.base/sun.security.rsa=ALL-UNNAMED" "--add-exports=java.base/sun.security.pkcs=ALL-UNNAMED" "--add-exports=java.base/sun.security.x509=ALL-UNNAMED"' - #extra_opts_escaped=$(sed 's/[\/&]/\\&/g' <<< "$extra_opts") + extra_opts_escaped=$(sed 's/[\/&]/\\&/g' <<< "$extra_opts") #echo $extra_opts_escaped - #sed "s/^\(DEFAULT_JVM_OPTS=\'.*\)\'$/\1 $extra_opts_escaped\'/" -i clouddriver-web/build/install/clouddriver/bin/clouddriver + sed "s/^\(DEFAULT_JVM_OPTS=\'.*\)\'$/\1 $extra_opts_escaped\'/" -i clouddriver-web/build/install/clouddriver/bin/clouddriver - # sed "s/^\(DEFAULT_JVM_OPTS\)\s*=\s*'.*'\$/\1='$extra_opts_escaped'/" -i clouddriver-web/build/install/clouddriver/bin/clouddriver + sed "s/^\(DEFAULT_JVM_OPTS\)\s*=\s*'.*'\$/\1='$extra_opts_escaped'/" -i clouddriver-web/build/install/clouddriver/bin/clouddriver # cat clouddriver-web/build/install/clouddriver/bin/clouddriver @@ -79,7 +79,7 @@ jobs: CUSTOMPLUGIN_RELEASEORG=opsmx CUSTOMPLUGIN_RELEASEREPO=armory-observability-plugin CUSTOMPLUGIN_RELEASEVERSION=v1.0.1 - file: docker/ubi8/gradle-build-dockerfile + file: docker/ubi8/Dockerfile-fips push: true tags: | "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}" From 5cdeb81cb41ae6c0ebdcc59d818cef49b02096fd Mon Sep 17 00:00:00 2001 From: Yugandharkumar Date: Wed, 31 Jan 2024 18:21:03 +0530 Subject: [PATCH 13/21] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 48fee9282f3..392bd79197b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ fiatVersion=1-0-SNAPSHOT -korkVersion=1-9-SNAPSHOT +korkVersion=nov13-SNAPSHOT org.gradle.parallel=true spinnakerGradleVersion=1-0-SNAPSHOT #targetJava11=true From 1b8694653aefba8657bed706c57b319b8d28312a Mon Sep 17 00:00:00 2001 From: Yugandharkumar Date: Wed, 31 Jan 2024 19:12:40 +0530 Subject: [PATCH 14/21] Update clouddriver-oes.yml --- .github/workflows/clouddriver-oes.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/clouddriver-oes.yml b/.github/workflows/clouddriver-oes.yml index 923d5e3868e..ca850613f67 100644 --- a/.github/workflows/clouddriver-oes.yml +++ b/.github/workflows/clouddriver-oes.yml @@ -51,24 +51,24 @@ jobs: sed -e 's/NEXUS_USERNAME/${{ secrets.NEXUS_USERNAME }}/' -i build.gradle sed -e 's/NEXUS_PASSWORD/${{ secrets.NEXUS_PASSWORD }}/' -i build.gradle - ./gradlew --no-daemon -PenableCrossCompilerPlugin=true clouddriver-web:installDist -x test + ./gradlew --no-daemon -PenableCrossCompilerPlugin=true clouddriver-web:installDist -x test #./gradlew --no-daemon clouddriver-web:installDist -x test - extra_opts='"--add-opens=java.base/sun.net=ALL-UNNAMED" "--add-exports=java.base/sun.net=ALL-UNNAMED" "--add-opens=java.base/java.time=ALL-UNNAMED"' + #extra_opts='"--add-opens=java.base/sun.net=ALL-UNNAMED" "--add-exports=java.base/sun.net=ALL-UNNAMED" "--add-opens=java.base/java.time=ALL-UNNAMED"' extra_opts='"-Djava.security.egd=file:/dev/./urandom" "-Dspring.config.import=optional:/opt/spinnaker/config/" "--add-opens=java.base/sun.net=ALL-UNNAMED" "--add-exports=java.base/sun.net=ALL-UNNAMED" "--add-opens=java.base/java.time=ALL-UNNAMED" "--add-exports=java.base/sun.security.rsa=ALL-UNNAMED" "--add-exports=java.base/sun.security.pkcs=ALL-UNNAMED" "--add-exports=java.base/sun.security.x509=ALL-UNNAMED"' extra_opts_escaped=$(sed 's/[\/&]/\\&/g' <<< "$extra_opts") - #echo $extra_opts_escaped + echo $extra_opts_escaped - sed "s/^\(DEFAULT_JVM_OPTS=\'.*\)\'$/\1 $extra_opts_escaped\'/" -i clouddriver-web/build/install/clouddriver/bin/clouddriver + #sed "s/^\(DEFAULT_JVM_OPTS=\'.*\)\'$/\1 $extra_opts_escaped\'/" -i clouddriver-web/build/install/clouddriver/bin/clouddriver sed "s/^\(DEFAULT_JVM_OPTS\)\s*=\s*'.*'\$/\1='$extra_opts_escaped'/" -i clouddriver-web/build/install/clouddriver/bin/clouddriver - # cat clouddriver-web/build/install/clouddriver/bin/clouddriver + cat clouddriver-web/build/install/clouddriver/bin/clouddriver - name: dockerBuildpush uses: docker/build-push-action@v2 From 70a4fd1354e0126bcd80c6b3264d00e4ddb280ba Mon Sep 17 00:00:00 2001 From: Yugandharkumar Date: Wed, 31 Jan 2024 19:15:13 +0530 Subject: [PATCH 15/21] install procps --- docker/ubi8/Dockerfile-dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/ubi8/Dockerfile-dev b/docker/ubi8/Dockerfile-dev index b14590d038c..7a1225c5e1c 100644 --- a/docker/ubi8/Dockerfile-dev +++ b/docker/ubi8/Dockerfile-dev @@ -53,7 +53,7 @@ USER root #RUN yum -y install bash jq tar unzip wget procps java-17-openjdk-devel.x86_64 vim net-tools curl git -RUN yum -y install wget git +RUN yum -y install wget git procps # AWS CLI From da0dd65905b9798ada8661cf876a6e5dd86f97e7 Mon Sep 17 00:00:00 2001 From: Sanjeev Thatiparthi <54054932+sanopsmx@users.noreply.github.com> Date: Wed, 31 Jan 2024 19:47:54 +0530 Subject: [PATCH 16/21] Temp fix to check if aws region is east-2 (#78) * Temp fix to check if aws & ecs accounts are fetched.We are seeing few issues with aws & ecs accounts. * Temp fix to check if aws region is east-2 --- clouddriver-web/config/clouddriver.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clouddriver-web/config/clouddriver.yml b/clouddriver-web/config/clouddriver.yml index ac77cd41bd8..e518368da86 100644 --- a/clouddriver-web/config/clouddriver.yml +++ b/clouddriver-web/config/clouddriver.yml @@ -84,7 +84,7 @@ aws: - deviceName: /dev/sdc virtualName: ephemeral1 defaultRegions: - - name: us-east-1 + - name: us-east-2 defaultKeyPairTemplate: '{{name}}-keypair' # an empty list means we are directly managing the AWS account we have credentials for (named default.account.env) From 2f4cc393bb34c51af0edbc3f1db077058c8bff9b Mon Sep 17 00:00:00 2001 From: Yugandharkumar Date: Wed, 31 Jan 2024 20:05:25 +0530 Subject: [PATCH 17/21] temp fix for configuration precedence by disabling aws temp fix for configuration precedence by disabling aws --- clouddriver-web/config/clouddriver.yml | 36 +++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/clouddriver-web/config/clouddriver.yml b/clouddriver-web/config/clouddriver.yml index e518368da86..efc6d43314c 100644 --- a/clouddriver-web/config/clouddriver.yml +++ b/clouddriver-web/config/clouddriver.yml @@ -52,8 +52,8 @@ default: account: env: default -aws: - enabled: ${AWS_ENABLED:false} +#aws: + # enabled: ${AWS_ENABLED:false} # features: # launch-templates: # enabled: true @@ -71,25 +71,25 @@ aws: # proxyDomain: foo # proxyWorkstation: foo # protocol: HTTP - defaults: - iamRole: BaseIAMRole - unknownInstanceTypeBlockDevice: - deviceName: /dev/sdb - size: 40 - instanceClassBlockDevices: - - instanceClass: m3 - blockDevices: - - deviceName: /dev/sdb - virtualName: ephemeral0 - - deviceName: /dev/sdc - virtualName: ephemeral1 - defaultRegions: - - name: us-east-2 - defaultKeyPairTemplate: '{{name}}-keypair' + # defaults: + # iamRole: BaseIAMRole + # unknownInstanceTypeBlockDevice: + # deviceName: /dev/sdb + # size: 40 + # instanceClassBlockDevices: + # - instanceClass: m3 + # blockDevices: + # - deviceName: /dev/sdb + # virtualName: ephemeral0 + # - deviceName: /dev/sdc + # virtualName: ephemeral1 + # defaultRegions: + # - name: us-east-2 + # defaultKeyPairTemplate: '{{name}}-keypair' # an empty list means we are directly managing the AWS account we have credentials for (named default.account.env) # see prod profile section below for an example configuration to manage other accounts via STS assume role - accounts: [] + # accounts: [] azure: enabled: ${AZURE_ENABLED:false} From c0b2d4839399726328b643b90e0bcd784f8671bf Mon Sep 17 00:00:00 2001 From: Sanjeev Thatiparthi <54054932+sanopsmx@users.noreply.github.com> Date: Thu, 1 Feb 2024 12:18:37 +0530 Subject: [PATCH 18/21] temp fix removed. Fixed the clouddriver.yml file. OP-21707 (#79) --- .../groovy/com/netflix/spinnaker/config/AwsConfiguration.groovy | 1 + .../java/com/netflix/spinnaker/config/EcsConfiguration.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/config/AwsConfiguration.groovy b/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/config/AwsConfiguration.groovy index b08537173ef..2758050964d 100644 --- a/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/config/AwsConfiguration.groovy +++ b/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/config/AwsConfiguration.groovy @@ -66,6 +66,7 @@ import org.springframework.core.Ordered import org.springframework.core.annotation.Order @Configuration +@ConditionalOnProperty('aws.enabled') @ComponentScan(["com.netflix.spinnaker.clouddriver.aws"]) @EnableConfigurationProperties(AwsConfigurationProperties) @Import([ diff --git a/clouddriver-ecs/src/main/java/com/netflix/spinnaker/config/EcsConfiguration.java b/clouddriver-ecs/src/main/java/com/netflix/spinnaker/config/EcsConfiguration.java index 4d0849735eb..80a203662d0 100644 --- a/clouddriver-ecs/src/main/java/com/netflix/spinnaker/config/EcsConfiguration.java +++ b/clouddriver-ecs/src/main/java/com/netflix/spinnaker/config/EcsConfiguration.java @@ -16,9 +16,11 @@ package com.netflix.spinnaker.config; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @Configuration @ComponentScan("com.netflix.spinnaker.clouddriver.ecs") +@ConditionalOnProperty("ecs.enabled") public class EcsConfiguration {} From 07daf90b798a7a9ee9cb7e4604d1d30354fe5428 Mon Sep 17 00:00:00 2001 From: Sanjeev Thatiparthi <54054932+sanopsmx@users.noreply.github.com> Date: Wed, 7 Feb 2024 13:21:45 +0530 Subject: [PATCH 19/21] Fixed the Docker accounts not loading issue by removing docker related configuration in clouddriver.yml. Once we remove here, it will pick the docker accounts from hal config. OP-21764 (#82) --- clouddriver-web/config/clouddriver.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/clouddriver-web/config/clouddriver.yml b/clouddriver-web/config/clouddriver.yml index efc6d43314c..21854a76be5 100644 --- a/clouddriver-web/config/clouddriver.yml +++ b/clouddriver-web/config/clouddriver.yml @@ -257,9 +257,6 @@ kubernetes: v2: applyAppLabels: true -dockerRegistry: - enabled: ${DOCKER_REGISTRY_ENABLED:false} - dcos: enabled: false From f47b5898c43ffe2d459d66d62d5976a55539bade Mon Sep 17 00:00:00 2001 From: keerthibingi Date: Mon, 12 Feb 2024 14:13:09 +0530 Subject: [PATCH 20/21] Updating branch in publish.yml --- .github/workflows/clouddriver-publish.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/clouddriver-publish.yml b/.github/workflows/clouddriver-publish.yml index 4b2425e8661..c2d4748a7c6 100644 --- a/.github/workflows/clouddriver-publish.yml +++ b/.github/workflows/clouddriver-publish.yml @@ -3,7 +3,7 @@ name: Branch Build clouddriver publish on: push: branches: - - OES-1.30.1 + - OES-1.30.1-nov-cve env: GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx6g -Xms6g @@ -21,10 +21,9 @@ jobs: with: java-version: 17 distribution: 'temurin' - cache: 'gradle' - name: Build env: - NEXUS_VERSION: 1-0-SNAPSHOT + NEXUS_VERSION: OES-1.30.1-nov-cve-SNAPSHOT run: | cat <> patch @@ -93,5 +92,7 @@ jobs: sed -e 's/NEXUS_PASSWORD/${{ secrets.NEXUS_PASSWORD }}/' -i settings.gradle sed -e 's/NEXUS_USERNAME/${{ secrets.NEXUS_USERNAME }}/' -i build.gradle sed -e 's/NEXUS_PASSWORD/${{ secrets.NEXUS_PASSWORD }}/' -i build.gradle - + sed 's/^korkVersion=.*/korkVersion=OES-1.30.1-nov-cve-SNAPSHOT/; s/^fiatVersion=.*/fiatVersion=OES-1.30.1-nov-cve-SNAPSHOT/' gradle.properties > gradle.properties-bkp + + mv gradle.properties-bkp gradle.properties ./gradlew --no-daemon -PenableCrossCompilerPlugin=true publish -x test From 1fd1ac3c2e687961489758785118426641815a30 Mon Sep 17 00:00:00 2001 From: keerthibingi Date: Mon, 12 Feb 2024 15:50:06 +0530 Subject: [PATCH 21/21] Updating build yaml --- .github/workflows/clouddriver-oes.yml | 4 ++++ .github/workflows/clouddriver-publish.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/.github/workflows/clouddriver-oes.yml b/.github/workflows/clouddriver-oes.yml index ca850613f67..6e42589fec3 100644 --- a/.github/workflows/clouddriver-oes.yml +++ b/.github/workflows/clouddriver-oes.yml @@ -50,6 +50,10 @@ jobs: sed -e 's/NEXUS_PASSWORD/${{ secrets.NEXUS_PASSWORD }}/' -i settings.gradle sed -e 's/NEXUS_USERNAME/${{ secrets.NEXUS_USERNAME }}/' -i build.gradle sed -e 's/NEXUS_PASSWORD/${{ secrets.NEXUS_PASSWORD }}/' -i build.gradle + + sed 's/^korkVersion=.*/korkVersion=OES-1.30.1-nov-cve-SNAPSHOT/; s/^fiatVersion=.*/fiatVersion=OES-1.30.1-nov-cve-SNAPSHOT/' gradle.properties > gradle.properties-bkp + + mv gradle.properties-bkp gradle.properties ./gradlew --no-daemon -PenableCrossCompilerPlugin=true clouddriver-web:installDist -x test diff --git a/.github/workflows/clouddriver-publish.yml b/.github/workflows/clouddriver-publish.yml index c2d4748a7c6..47092ffa4fd 100644 --- a/.github/workflows/clouddriver-publish.yml +++ b/.github/workflows/clouddriver-publish.yml @@ -92,6 +92,7 @@ jobs: sed -e 's/NEXUS_PASSWORD/${{ secrets.NEXUS_PASSWORD }}/' -i settings.gradle sed -e 's/NEXUS_USERNAME/${{ secrets.NEXUS_USERNAME }}/' -i build.gradle sed -e 's/NEXUS_PASSWORD/${{ secrets.NEXUS_PASSWORD }}/' -i build.gradle + sed 's/^korkVersion=.*/korkVersion=OES-1.30.1-nov-cve-SNAPSHOT/; s/^fiatVersion=.*/fiatVersion=OES-1.30.1-nov-cve-SNAPSHOT/' gradle.properties > gradle.properties-bkp mv gradle.properties-bkp gradle.properties