Commit af50028c authored by Maksimelyan Tamashevich (EPAM)'s avatar Maksimelyan Tamashevich (EPAM)
Browse files

Merge branch 'master' into GONRG-3541_Update_anthos_version

parents 74100ba0 d4824772
Pipeline #75186 passed with stage
in 1 minute and 23 seconds
......@@ -3,22 +3,18 @@ containerize_osdu_gcp_airflow_bootstrap:
image: docker:19.03.15
tags: ["osdu-medium"]
services:
- docker:19.03.15-dind
- docker:20.10.7-dind
variables:
IMAGE_NAME: osdu-bootstrap-airflow
SHORT_SHA_IMAGE: ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${CI_COMMIT_SHORT_SHA}
LATEST_IMAGE: ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:latest
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script:
# Gitlab Container Registry
- docker build -t $IMAGE_NAME:local -f bootstrap_airflow/Dockerfile .
- docker tag $IMAGE_NAME:local $SHORT_SHA_IMAGE
- docker tag $IMAGE_NAME:local $LATEST_IMAGE
- docker push $SHORT_SHA_IMAGE
- docker push $LATEST_IMAGE
- export EXTRA_DOCKER_TAG=""; if [ "$CI_COMMIT_TAG" != "" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_TAG" ; elif [ "$CI_COMMIT_REF_NAME" = "master" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/$IMAGE_NAME:latest" ; fi
- docker build -t $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA $EXTRA_DOCKER_TAG --file bootstrap_airflow/Dockerfile .
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker push $CI_REGISTRY_IMAGE/$IMAGE_NAME
only:
refs:
- master
- /.*bootstrap.*/
- tags
......@@ -3,19 +3,17 @@ containerize_osdu_gcp_ent_bootstrap_image:
image: docker:19.03.15
tags: ["osdu-medium"]
services:
- docker:19.03.15-dind
- docker:20.10.7-dind
variables:
IMAGE_NAME: osdu-bootstrap_ent
SHORT_SHA_IMAGE: ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${CI_COMMIT_SHORT_SHA}
LATEST_IMAGE: ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:latest
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script:
# Gitlab Container Registry
- docker build -t $SHORT_SHA_IMAGE -t $LATEST_IMAGE -f bootstrap_entitlements/Dockerfile .
- docker push $SHORT_SHA_IMAGE
- docker push $LATEST_IMAGE
- export EXTRA_DOCKER_TAG=""; if [ "$CI_COMMIT_TAG" != "" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_TAG" ; elif [ "$CI_COMMIT_REF_NAME" = "master" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/$IMAGE_NAME:latest" ; fi
- docker build -t $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA $EXTRA_DOCKER_TAG --file bootstrap_entitlements/Dockerfile .
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker push $CI_REGISTRY_IMAGE/$IMAGE_NAME
only:
refs:
- master
- /.*bootstrap.*/
- tags
......@@ -3,21 +3,17 @@ containerize_osdu_gcp_infra_bootstrap_image:
image: docker:19.03.15
tags: ["osdu-medium"]
services:
- docker:19.03.15-dind
- docker:20.10.7-dind
variables:
IMAGE_NAME: osdu-bootstrap_infra
SHORT_SHA_IMAGE: ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${CI_COMMIT_SHORT_SHA}
LATEST_IMAGE: ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:latest
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script:
# Gitlab Container Registry
- docker build -t $IMAGE_NAME:local -f bootstrap_infra/Dockerfile .
- docker tag $IMAGE_NAME:local $SHORT_SHA_IMAGE
- docker tag $IMAGE_NAME:local $LATEST_IMAGE
- docker push $SHORT_SHA_IMAGE
- docker push $LATEST_IMAGE
- export EXTRA_DOCKER_TAG=""; if [ "$CI_COMMIT_TAG" != "" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_TAG" ; elif [ "$CI_COMMIT_REF_NAME" = "master" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/$IMAGE_NAME:latest" ; fi
- docker build -t $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA $EXTRA_DOCKER_TAG --file bootstrap_infra/Dockerfile .
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker push $CI_REGISTRY_IMAGE/$IMAGE_NAME
only:
refs:
- master
- /.*bootstrap.*/
- tags
......@@ -3,21 +3,17 @@ containerize_osdu_gcp_partition_bootstrap_image:
image: docker:19.03.15
tags: ["osdu-medium"]
services:
- docker:19.03.15-dind
- docker:20.10.7-dind
variables:
IMAGE_NAME: osdu-bootstrap-partition
SHORT_SHA_IMAGE: ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${CI_COMMIT_SHORT_SHA}
LATEST_IMAGE: ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:latest
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script:
# Gitlab Container Registry
- docker build -t $IMAGE_NAME:local -f bootstrap_partition/Dockerfile .
- docker tag $IMAGE_NAME:local $SHORT_SHA_IMAGE
- docker tag $IMAGE_NAME:local $LATEST_IMAGE
- docker push $SHORT_SHA_IMAGE
- docker push $LATEST_IMAGE
- export EXTRA_DOCKER_TAG=""; if [ "$CI_COMMIT_TAG" != "" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_TAG" ; elif [ "$CI_COMMIT_REF_NAME" = "master" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/$IMAGE_NAME:latest" ; fi
- docker build -t $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA $EXTRA_DOCKER_TAG --file bootstrap_partition/Dockerfile .
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker push $CI_REGISTRY_IMAGE/$IMAGE_NAME
only:
refs:
- master
- /.*bootstrap.*/
- tags
......@@ -3,22 +3,17 @@ containerize_osdu_gcp_pub_sub_bootstrap:
image: docker:19.03.15
tags: ["osdu-medium"]
services:
- docker:19.03.15-dind
- docker:20.10.7-dind
variables:
IMAGE_NAME: osdu-bootstrap-pub-sub
SHORT_SHA_IMAGE: ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${CI_COMMIT_SHORT_SHA}
LATEST_IMAGE: ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:latest
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script:
# Gitlab Container Registry
- docker build -t $IMAGE_NAME:local -f bootstrap_pub_sub/Dockerfile .
- docker tag $IMAGE_NAME:local $SHORT_SHA_IMAGE
- docker tag $IMAGE_NAME:local $LATEST_IMAGE
- docker push $SHORT_SHA_IMAGE
- docker push $LATEST_IMAGE
- export EXTRA_DOCKER_TAG=""; if [ "$CI_COMMIT_TAG" != "" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_TAG" ; elif [ "$CI_COMMIT_REF_NAME" = "master" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/$IMAGE_NAME:latest" ; fi
- docker build -t $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA $EXTRA_DOCKER_TAG --file bootstrap_pub_sub/Dockerfile .
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker push $CI_REGISTRY_IMAGE/$IMAGE_NAME
only:
refs:
- master
- /.*bootstrap.*/
- tags
......@@ -3,22 +3,17 @@ containerize_osdu_gcp_register_bootstrap:
image: docker:19.03.15
tags: ["osdu-medium"]
services:
- docker:19.03.15-dind
- docker:20.10.7-dind
variables:
IMAGE_NAME: osdu-bootstrap-register
SHORT_SHA_IMAGE: ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${CI_COMMIT_SHORT_SHA}
LATEST_IMAGE: ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:latest
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script:
# Gitlab Container Registry
- docker build -t $IMAGE_NAME:local -f bootstrap_register/Dockerfile .
- docker tag $IMAGE_NAME:local $SHORT_SHA_IMAGE
- docker tag $IMAGE_NAME:local $LATEST_IMAGE
- docker push $SHORT_SHA_IMAGE
- docker push $LATEST_IMAGE
- export EXTRA_DOCKER_TAG=""; if [ "$CI_COMMIT_TAG" != "" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_TAG" ; elif [ "$CI_COMMIT_REF_NAME" = "master" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/$IMAGE_NAME:latest" ; fi
- docker build -t $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA $EXTRA_DOCKER_TAG --file bootstrap_register/Dockerfile .
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker push $CI_REGISTRY_IMAGE/$IMAGE_NAME
only:
refs:
- master
- /.*bootstrap.*/
- tags
......@@ -18,7 +18,6 @@ data "google_container_engine_versions" "version" {
version_prefix = var.gke_version_prefix
}
resource "google_container_cluster" "primary" {
depends_on = [google_compute_managed_ssl_certificate.default, google_sql_database_instance.master, google_compute_ssl_policy.osdu-ssl-policy]
provider = google-beta
......@@ -31,7 +30,7 @@ resource "google_container_cluster" "primary" {
# enabling VPC-native:
ip_allocation_policy {}
workload_identity_config {
identity_namespace = "${var.service_google_project}.svc.id.goog"
workload_pool = "${var.service_google_project}.svc.id.goog"
}
lifecycle {
ignore_changes = [
......
apiVersion: networking.k8s.io/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: default
......@@ -10,6 +10,8 @@ metadata:
ingress.kubernetes.io/enable-cors: "true"
networking.gke.io/v1beta1.FrontendConfig: "frontend-config"
spec:
backend:
serviceName: istio-ingressgateway
servicePort: 80
defaultBackend:
service:
name: istio-ingressgateway
port:
number: 80
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment