From 0e297dc7d328bd58892fc076e92680a4578ed36f Mon Sep 17 00:00:00 2001 From: Marc Burnie Date: Tue, 6 Sep 2022 21:16:31 +0000 Subject: [PATCH] Versioning helm charts. commit c6dd7196 Author: Marc Burnie Date: Tue Aug 30 2022 09:23:03 GMT-0500 (Central Daylight Time) Merge branch 'dev' into helm commit e057ef61 Author: Marc Burnie Date: Tue Aug 30 2022 07:38:53 GMT-0500 (Central Daylight Time) muting wget commit 912fcdfb Author: Marc Burnie Date: Mon Aug 29 2022 13:51:31 GMT-0500 (Central Daylight Time) adding versioning helm chart commit 73d828a5 Author: Marc Burnie Date: Fri Jul 29 2022 20:41:36 GMT-0500 (Central Daylight Time) changing role arn commit 62c09fab Author: Marc Burnie Date: Fri Jul 29 2022 14:58:45 GMT-0500 (Central Daylight Time) Merge branch 'dev' into helm commit f0611e9d Author: Marc Burnie Date: Fri Jul 29 2022 14:55:18 GMT-0500 (Central Daylight Time) using release namespace commit f8009143 Author: Marc Burnie Date: Wed Jul 27 2022 16:28:39 GMT-0500 (Central Daylight Time) using release namespace commit 52ad1711 Author: Marc Burnie Date: Wed Jul 27 2022 13:30:56 GMT-0500 (Central Daylight Time) using service name in template naming sheme due to shared namespacing commit 4c8fb878 Author: Marc Burnie Date: Tue Jul 26 2022 16:27:54 GMT-0500 (Central Daylight Time) correcting hpa resource commit a1921b86 Author: Marc Burnie Date: Tue Jul 26 2022 10:42:07 GMT-0500 (Central Daylight Time) adding build files to helmignore commit f8e5dbe9 Author: Marc Burnie Date: Mon Jul 25 2022 16:53:17 GMT-0500 (Central Daylight Time) correcting README commit 9812e999 Author: Marc Burnie Date: Mon Jul 25 2022 15:12:56 GMT-0500 (Central Daylight Time) fixing schema commit 1d8b7444 Author: Marc Burnie Date: Fri Jul 22 2022 12:43:03 GMT-0500 (Central Daylight Time) moving some parameters to global values commit fe537cb4 Author: Marc Burnie Date: Wed Jul 20 2022 14:40:43 GMT-0500 (Central Daylight Time) adding initial service helm chart --- devops/aws/chart/Chart.yaml | 2 +- provider/indexer-aws/build-aws/buildspec.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devops/aws/chart/Chart.yaml b/devops/aws/chart/Chart.yaml index fb8d99b2..8205906f 100644 --- a/devops/aws/chart/Chart.yaml +++ b/devops/aws/chart/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: "os-indexer" -version: 0.1.0 +version: kubeVersion: "v1.21.x-x-x" description: Indexer Helm Chart for Kubernetes type: application diff --git a/provider/indexer-aws/build-aws/buildspec.yaml b/provider/indexer-aws/build-aws/buildspec.yaml index 9a877594..45269f84 100644 --- a/provider/indexer-aws/build-aws/buildspec.yaml +++ b/provider/indexer-aws/build-aws/buildspec.yaml @@ -42,6 +42,7 @@ phases: - echo $JAVA_HOME #WHY - mkdir -p /root/.m2 - cp ./provider/indexer-aws/maven/settings.xml /root/.m2/settings.xml # copy the AWS-specific settings.xml to the CodeBuild instance's .m2 folder + - wget https://github.com/mikefarah/yq/releases/download/v4.27.2/yq_linux_amd64 -q -O /usr/bin/yq && chmod +x /usr/bin/yq - export AWS_ACCOUNT_ID=`aws sts get-caller-identity | grep Account | cut -d':' -f 2 | cut -d'"' -f 2` - export AWS_OSDU_DEV_MAVEN_AUTH_TOKEN=`aws codeartifact get-authorization-token --domain $AWS_OSDU_DEV_MAVEN_DOMAIN --domain-owner $AWS_ACCOUNT_ID --query authorizationToken --output text` pre_build: @@ -61,18 +62,17 @@ phases: - mkdir -p ${OUTPUT_DIR}/bin - mkdir -p ${OUTPUT_DIR}/testing && mkdir -p ${INTEGRATION_TEST_OUTPUT} && mkdir -p ${INTEGRATION_TEST_OUTPUT}/bin - echo "Placeholder" >> ${OUTPUT_DIR}/build-info.json # touched so that the output directory has some content incase the build fails so that testing reports are uploaded + - pom_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) + - export VERSION=${pom_version%-*} - printenv - echo "Building primary service assemblies..." - mvn -ntp -B test install sonar:sonar -pl .,indexer-core,provider/indexer-aws -Ddeployment.environment=prod -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME} -# - echo "Copying assemblies to dist..." -# - cp ./provider/indexer-aws/target/*spring-boot.jar ${OUTPUT_DIR}/bin # copy aws jars -# - cp ./indexer-core/target/*.jar ${OUTPUT_DIR}/bin # copy core jar - - echo "Building integration testing assemblies and gathering artifacts..." - ./testing/indexer-test-aws/build-aws/prepare-dist.sh + - yq -i '.version = strenv(VERSION)' devops/aws/chart/Chart.yaml - echo "--Copying Helm Charts to ${OUTPUT_DIR:-dist}--" - rsync -r devops/aws/* "${OUTPUT_DIR:-dist}" -- GitLab