Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ci-operator/step-registry/gcp/OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ approvers:
- gpei
- jianlinliu
- jianli-wei

1 change: 0 additions & 1 deletion ci-operator/step-registry/gcp/deprovision/OWNERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
approvers:
- wgahnagl
- gpei
- jianlinliu
- jianli-wei
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"path": "gcp/deprovision/bastionhost/gcp-deprovision-bastionhost-ref.yaml",
"owners": {
"approvers": [
"wgahnagl",
"gpei",
"jianlinliu",
"jianli-wei"
Expand Down
1 change: 1 addition & 0 deletions ci-operator/step-registry/gcp/deprovision/buildhost/OWNERS
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
approvers:
- wgahnagl
- rphillips
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"path": "gcp/deprovision/buildhost/gcp-deprovision-buildhost-ref.yaml",
"owners": {
"approvers": [
"wgahnagl",
"rphillips"
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"path": "gcp/deprovision/vpc/gcp-deprovision-vpc-ref.yaml",
"owners": {
"approvers": [
"wgahnagl",
"gpei",
"jianlinliu",
"jianli-wei"
Expand Down
2 changes: 0 additions & 2 deletions ci-operator/step-registry/gcp/provision/OWNERS
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
approvers:
- wgahnagl
- gpei
- jianlinliu
- jianli-wei

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"path": "gcp/provision/bastionhost/gcp-provision-bastionhost-ref.yaml",
"owners": {
"approvers": [
"wgahnagl",
"gpei",
"jianlinliu",
"jianli-wei"
Expand Down
1 change: 0 additions & 1 deletion ci-operator/step-registry/gcp/provision/buildhost/OWNERS

This file was deleted.

3 changes: 3 additions & 0 deletions ci-operator/step-registry/gcp/provision/buildhost/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
approvers:
- wgahnagl
- rphillips
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ workdir=`mktemp -d`
###############Log In################
#####################################

workdir=`mktemp -d`
curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq

GOOGLE_PROJECT_ID="$(< ${CLUSTER_PROFILE_DIR}/openshift_gcp_project)"
export GCP_SHARED_CREDENTIALS_FILE="${CLUSTER_PROFILE_DIR}/gce.json"
sa_email=$(jq -r .client_email ${GCP_SHARED_CREDENTIALS_FILE})
Expand All @@ -45,8 +42,8 @@ echo "Using region: ${REGION}"

VPC_CONFIG="${SHARED_DIR}/customer_vpc_subnets.yaml"
if [[ -z "${NETWORK}" || -z "${CONTROL_PLANE_SUBNET}" ]]; then
NETWORK=$(/tmp/yq r "${VPC_CONFIG}" 'platform.gcp.network')
CONTROL_PLANE_SUBNET=$(/tmp/yq r "${VPC_CONFIG}" 'platform.gcp.controlPlaneSubnet')
NETWORK=$(yq-go r "${VPC_CONFIG}" 'platform.gcp.network')
CONTROL_PLANE_SUBNET=$(yq-go r "${VPC_CONFIG}" 'platform.gcp.controlPlaneSubnet')
fi
if [[ -z "${NETWORK}" || -z "${CONTROL_PLANE_SUBNET}" ]]; then
echo "Could not find VPC network and control-plane subnet" && exit 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
"owners": {
"approvers": [
"wgahnagl",
"gpei",
"jianlinliu",
"jianli-wei"
"rphillips"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"path": "gcp/provision/vpc/gcp-provision-vpc-ref.yaml",
"owners": {
"approvers": [
"wgahnagl",
"gpei",
"jianlinliu",
"jianli-wei"
Expand Down