Skip to content

ROX-35590: Expose gcp-project as parameter for gke-default flavor #1893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tommartensen wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

ROX-35590: Expose gcp-project as parameter for gke-default flavor #1893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions chart/infra-server/static/flavors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,11 @@
value: false
kind: optional

- name: gcp-project
description: Google Cloud project to deploy infrastructure into.
value: acs-team-temp-dev
kind: optional

Comment thread
coderabbitai[bot] marked this conversation as resolved.
artifacts:
- name: kubeconfig
description: Kube config for connecting to this cluster
Expand Down Expand Up @@ -1197,6 +1202,9 @@
- name: gcp-zone
description: Google Cloud zone to delete infrastructure from.
value: us-central1-a
- name: gcp-project
description: Google Cloud project to delete infrastructure from.
value: acs-team-temp-dev

- id: janitor-delete-openshift-4
name: Janitor delete Openshift
Expand Down Expand Up @@ -1307,6 +1315,11 @@
value: us-central1-a
kind: optional

- name: gcp-project
description: Google Cloud project to deploy infrastructure into.
value: acs-team-temp-dev
kind: optional

artifacts:
- name: kubeconfig
description: Kube config for connecting to this cluster
Expand Down
4 changes: 3 additions & 1 deletion chart/infra-server/static/janitor-delete-gke-default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ spec:
- name: name
- name: gcp-zone
value: ""
- name: gcp-project
value: ""

volumes:
- name: credentials
Expand All @@ -31,7 +33,7 @@ spec:
args:
- destroy
- --name={{ "{{" }}workflow.parameters.name{{ "}}" }}
- --gcp-project=acs-team-temp-dev
- --gcp-project={{ "{{" }}workflow.parameters.gcp-project{{ "}}" }}
- --gcp-zone={{ "{{" }}workflow.parameters.gcp-zone{{ "}}" }}
volumeMounts:
- name: credentials
Expand Down
6 changes: 4 additions & 2 deletions chart/infra-server/static/test-gke-lite.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ spec:
value: ""
- name: gcp-zone
value: ""
- name: gcp-project
value: ""

volumes:
- name: credentials
Expand Down Expand Up @@ -72,7 +74,7 @@ spec:
- --name={{ "{{" }}workflow.parameters.name{{ "}}" }}
- --nodes={{ "{{" }}workflow.parameters.nodes{{ "}}" }}
- --machine-type={{ "{{" }}workflow.parameters.machine-type{{ "}}" }}
- --gcp-project=acs-team-temp-dev
- --gcp-project={{ "{{" }}workflow.parameters.gcp-project{{ "}}" }}
- --creation-source=infra
- --k8s-version={{ "{{" }}workflow.parameters.k8s-version{{ "}}" }}
- --pod-security-policy={{ "{{" }}workflow.parameters.pod-security-policy{{ "}}" }}
Expand All @@ -95,7 +97,7 @@ spec:
args:
- destroy
- --name={{ "{{" }}workflow.parameters.name{{ "}}" }}
- --gcp-project=acs-team-temp-dev
- --gcp-project={{ "{{" }}workflow.parameters.gcp-project{{ "}}" }}
- --gcp-zone={{ "{{" }}workflow.parameters.gcp-zone{{ "}}" }}
volumeMounts:
- name: credentials
Expand Down
7 changes: 4 additions & 3 deletions chart/infra-server/static/workflow-gke-default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ spec:
value: ""
- name: set-ssd-storage-default
value: ""

- name: gcp-project
value: ""
volumes:
- name: credentials
secret:
Expand Down Expand Up @@ -75,7 +76,7 @@ spec:
- --name={{ "{{" }}workflow.parameters.name{{ "}}" }}
- --nodes={{ "{{" }}workflow.parameters.nodes{{ "}}" }}
- --machine-type={{ "{{" }}workflow.parameters.machine-type{{ "}}" }}
- --gcp-project=acs-team-temp-dev
- --gcp-project={{ "{{" }}workflow.parameters.gcp-project{{ "}}" }}
- --creation-source=infra
- --k8s-version={{ "{{" }}workflow.parameters.k8s-version{{ "}}" }}
- --pod-security-policy={{ "{{" }}workflow.parameters.pod-security-policy{{ "}}" }}
Expand All @@ -99,7 +100,7 @@ spec:
args:
- destroy
- --name={{ "{{" }}workflow.parameters.name{{ "}}" }}
- --gcp-project=acs-team-temp-dev
- --gcp-project={{ "{{" }}workflow.parameters.gcp-project{{ "}}" }}
- --gcp-zone={{ "{{" }}workflow.parameters.gcp-zone{{ "}}" }}
volumeMounts:
- name: credentials
Expand Down
Loading