Skip to content

configs/openshift/installer: Add jobs for Azure testing #3877

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

Merged
openshift-merge-robot merged 3 commits into from
Jun 4, 2019
Merged

configs/openshift/installer: Add jobs for Azure testing #3877

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d630ab
ci-operator: add cluster-profile-azure4 secrets
abhinavdahiya May 23, 2019
d00da5d
templates/openshift/installer: Add azure cluster test configuration
abhinavdahiya May 23, 2019
868e0fb
configs/openshift/installer: Add jobs for Azure testing
abhinavdahiya May 23, 2019
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
9 changes: 9 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,15 @@ azure-secrets:
oc create secret generic codecov-token --from-literal=upload=${CODECOV_UPLOAD_TOKEN} -o yaml --dry-run | oc apply -n azure -f -
.PHONY: azure-secrets

azure4-secrets:

@smarterclayton smarterclayton Jun 4, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please call this azure-e2e-secrets for now (azure4 is confusing). @jim-minter since azure is camping on the convention that the rest of the e2e suites run, I would prefer if you guys can over time migrate from azure-secrets to azure-aro-secrets or similar. The base namespace belongs to the core CI platform.

oc create secret generic cluster-secrets-azure4 \
--from-file=cluster/test-deploy/azure4/osServicePrincipal.json \

@smarterclayton smarterclayton Jun 4, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This actually shouldn't be used, can you remove this section? ci-operator/populate-secrets-from-bitwarden is used instead.

--from-file=cluster/test-deploy/azure4/pull-secret \
--from-file=cluster/test-deploy/azure4/ssh-privatekey \
--from-file=cluster/test-deploy/azure4/ssh-publickey \
-o yaml --dry-run | oc apply -n ocp -f -
.PHONY: azure4-secrets

metering:
$(MAKE) -C projects/metering
.PHONY: metering
Expand Down
9 changes: 9 additions & 0 deletions ci-operator/SECRETS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@ currently exist:
| `metrics-int.key` | Azure Geneva metrics authentication key |
| `system-docker-config.json` | Root/node/system level docker config.json file, currently holding access registry.redhat.io |

#### `cluster-secrets-azure4`

| Key | Description |
| ----------------------------------| ----------- |
| `osServicePrincipal.json` | Credentials for the Azure API. This is a json file that contains fields described in [upstream credentials doc](https://docs.microsoft.com/en-us/azure-stack/operator/azure-stack-create-service-principals#create-a-service-principal-using-a-client-secret). |

@stevekuznetsov stevekuznetsov May 23, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@coverprice this would be the secret we need in bitwarden

| `pull-secret` | Credentials for pulling OpenShift images from Quay and for authenticating to telemetry. Retrieved from [try.openshift.com](https://try.openshift.com) under the ccoleman+openshift-ci-test@redhat.com account, and has the service account token from the `ocp` namespace added with `oc registry login --to=/tmp/pull-secret -z default -n ocp`.|
| `ssh-privatekey` | Private half of the SSH key, for connecting to Azure VMs. |
| `ssh-publickey` | Public half of the SSH key, for connecting to Azure VMs. |

#### `cluster-secrets-vsphere`

| Key | Description |
Expand Down
6 changes: 6 additions & 0 deletions cluster/ci/config/secret-mirroring/mapping.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ secrets:
to:
namespace: ci-stg
name: cluster-secrets-azure
- from:
namespace: ci
name: cluster-secrets-azure4
to:
namespace: ci-stg
name: cluster-secrets-azure4
- from:
namespace: ci
name: cluster-secrets-gcp
Expand Down
5 changes: 5 additions & 0 deletions cluster/test-deploy/azure4/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*
!.type
!.gitignore
!OWNERS
!secret_example
1 change: 1 addition & 0 deletions cluster/test-deploy/azure4/.type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
azure4
6 changes: 6 additions & 0 deletions cluster/test-deploy/azure4/secret_example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"subscriptionId": "xxxxx",
"clientId": "xxxxx",
"clientSecret": "xxxxx",
"tenantId": "xxxxx"
}