Skip to content
Snippets Groups Projects
Commit 221fce2b authored by Marc Burnie [AWS]'s avatar Marc Burnie [AWS]
Browse files

removing containzerize override

parent bfecbde8
No related branches found
No related tags found
1 merge request!546AWS: Building multi-arch images
Pipeline #299242 passed with warnings
...@@ -4,7 +4,6 @@ variables: ...@@ -4,7 +4,6 @@ variables:
PYTEST_DIR: app/tests/unit PYTEST_DIR: app/tests/unit
AWS_BUILD_SUBDIR: build/aws/build-aws AWS_BUILD_SUBDIR: build/aws/build-aws
# AWS_TEST_SUBDIR: testing/storage-test-aws
AWS_SERVICE: policy AWS_SERVICE: policy
AWS_SERVICE_NAMESPACE: osdu-services AWS_SERVICE_NAMESPACE: osdu-services
AWS_SERVICE_GATEWAY: osdu-gateway AWS_SERVICE_GATEWAY: osdu-gateway
......
...@@ -12,37 +12,6 @@ ...@@ -12,37 +12,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
aws-containerize:
before_script:
- apt-get install -y software-properties-common
- apt-get install -y python3 python3-pip
- python3 -m pip install -r requirements_setversion.txt
- cd app
- make build_docker
- cd ..
aws-update-helm:
script:
- aws ecr get-login-password --region us-east-1 | helm registry login --username AWS --password-stdin ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com
- export KUBECONFIG=/tmp/kubeconfig-${RANDOM}.yaml
- aws eks update-kubeconfig --region $AWS_REGION --name $EKS_CLUSTER_NAME --role-arn $EKS_CLUSTER_MGMT_ROLE
- chmod 600 $KUBECONFIG
- sed -i "s|__CHART_VERSION__|0.1.0|" $CHART_DIR/Chart.yaml
- sed -i "s|__VERSION__|0.1.0|" $CHART_DIR/Chart.yaml
- sed -i "s|__HELM_REPO__|$AWS_HELM_REPO|" $CHART_DIR/Chart.yaml
- sed -i "s|__CONTAINER__|$AWS_IMAGE_TAG_BASE:$CI_COMMIT_SHA|" $CHART_DIR/values.yaml
- sed -i "s|__CHART_VERSION__|0.1.0|" devops/aws/opa/Chart.yaml
- sed -i "s|__VERSION__|0.1.0|" devops/aws/opa/Chart.yaml
- sed -i "s|__HELM_REPO__|$AWS_HELM_REPO|" devops/aws/opa/Chart.yaml
- helm dependency update devops/aws/opa
- helm upgrade opa-agent devops/aws/opa/ -i -n ${AWS_SERVICE_NAMESPACE:-osdu-services} --set global.resourcePrefix=$RESOURCE_PREFIX --set global.region=$AWS_REGION --set-string global.accountID=$AWS_ACCOUNT_ID --set global.policyBucket=$POLICY_BUCKET --set global.allowOrigins=$ALLOWED_ORIGINS --set global.gatewayName=$GATEWAY --set global.cacheClusterEndpoint=${CACHE_CLUSTER_ENDPOINT} --set global.cacheClusterPort=${CACHE_CLUSTER_PORT} --set global.cacheClusterKey=${CACHE_CLUSTER_KEY} --set "partitions={osdu,opendes,int-test-policy,int-test-storage,performance-test}"
- helm dependency update $CHART_DIR
- helm upgrade $AWS_EKS_DEPLOYMENT_NAME $CHART_DIR/ -i -n ${AWS_SERVICE_NAMESPACE:-osdu-services} --set global.resourcePrefix=$RESOURCE_PREFIX --set global.region=$AWS_REGION --set-string global.accountID=$AWS_ACCOUNT_ID --set global.policyBucket=$POLICY_BUCKET --set global.allowOrigins=$ALLOWED_ORIGINS --set global.gatewayName=$GATEWAY --set global.cacheClusterEndpoint=${CACHE_CLUSTER_ENDPOINT} --set global.cacheClusterPort=${CACHE_CLUSTER_PORT} --set global.cacheClusterKey=${CACHE_CLUSTER_KEY}
- kubectl -n ${AWS_SERVICE_NAMESPACE:-osdu-services} rollout status -w deployment/${AWS_EKS_DEPLOYMENT_NAME} --timeout=300s
aws-test-python: aws-test-python:
image: $CI_REGISTRY/osdu/platform/deployment-and-operations/base-containers-aws/aws-python/aws-python:v1.0-py3.11 image: $CI_REGISTRY/osdu/platform/deployment-and-operations/base-containers-aws/aws-python/aws-python:v1.0-py3.11
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment