From 3dc8b9e3390c6a678f06332bc038f3834b90948d Mon Sep 17 00:00:00 2001 From: Arek Rus Date: Wed, 19 Feb 2020 10:42:45 +0100 Subject: [PATCH 1/2] Replace repo urls --- .../fluxbot.yaml | 2 +- .../node-red.yaml | 2 +- .../shield-com.yaml | 2 +- .../shield-org.yaml | 2 +- .../travis-autoscaler.yaml | 2 +- .../travis-build-org.yaml | 2 +- .../travis-listener-pro.yaml | 2 +- .../travis-listener.yaml | 2 +- .../travis-scheduler-pro.yaml | 2 +- .../travis-scheduler.yaml | 2 +- .../travis-vcs-pro.yaml | 2 +- .../travis-vcs.yaml | 2 +- .../gcloud-cleanup.yaml | 2 +- .../worker-com-free.yaml | 2 +- .../gke_travis-staging-1_us-central1_workers-1/worker-com.yaml | 2 +- .../worker-org-k8s-queue.yaml | 2 +- .../worker-org-test-ue1.yaml | 2 +- .../gke_travis-staging-1_us-central1_workers-1/worker-org.yaml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/fluxbot.yaml b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/fluxbot.yaml index f8ad32c0be..ec86f24464 100644 --- a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/fluxbot.yaml +++ b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/fluxbot.yaml @@ -7,7 +7,7 @@ metadata: spec: chart: path: charts/fluxbot - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: fluxbot values: diff --git a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/node-red.yaml b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/node-red.yaml index 652379e06f..5b06c79631 100644 --- a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/node-red.yaml +++ b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/node-red.yaml @@ -9,7 +9,7 @@ metadata: spec: chart: path: charts/node-red - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: node-red values: diff --git a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/shield-com.yaml b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/shield-com.yaml index 3f75280cf9..e19a24320a 100644 --- a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/shield-com.yaml +++ b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/shield-com.yaml @@ -7,7 +7,7 @@ metadata: spec: chart: path: charts/shield - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: shield-com values: diff --git a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/shield-org.yaml b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/shield-org.yaml index fdc94a609e..0ed9e792ea 100644 --- a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/shield-org.yaml +++ b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/shield-org.yaml @@ -7,7 +7,7 @@ metadata: spec: chart: path: charts/shield - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: shield-org values: diff --git a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-autoscaler.yaml b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-autoscaler.yaml index b358d2dca0..be11caf24f 100644 --- a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-autoscaler.yaml +++ b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-autoscaler.yaml @@ -9,7 +9,7 @@ metadata: spec: chart: path: charts/travis-autoscaler - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: travis-autoscaler values: diff --git a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-build-org.yaml b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-build-org.yaml index ba4cc6cd16..393f82c407 100644 --- a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-build-org.yaml +++ b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-build-org.yaml @@ -7,7 +7,7 @@ metadata: spec: chart: path: charts/travis-build - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: travis-build values: diff --git a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-listener-pro.yaml b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-listener-pro.yaml index 6ce50fb7c5..d5b323e530 100644 --- a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-listener-pro.yaml +++ b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-listener-pro.yaml @@ -7,7 +7,7 @@ metadata: spec: chart: path: charts/travis-listener - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: travis-listener-pro values: diff --git a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-listener.yaml b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-listener.yaml index 62ace2b7d2..e9363de88a 100644 --- a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-listener.yaml +++ b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-listener.yaml @@ -7,7 +7,7 @@ metadata: spec: chart: path: charts/travis-listener - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: travis-listener values: diff --git a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-scheduler-pro.yaml b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-scheduler-pro.yaml index a2955d1b97..6790e138fd 100644 --- a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-scheduler-pro.yaml +++ b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-scheduler-pro.yaml @@ -7,7 +7,7 @@ metadata: spec: chart: path: charts/travis-scheduler - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: travis-scheduler values: diff --git a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-scheduler.yaml b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-scheduler.yaml index cf8b99fce2..cbc95dc8f3 100644 --- a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-scheduler.yaml +++ b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-scheduler.yaml @@ -7,7 +7,7 @@ metadata: spec: chart: path: charts/travis-scheduler - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: travis-scheduler values: diff --git a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-vcs-pro.yaml b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-vcs-pro.yaml index da3bb6e0c6..9c78e51afa 100644 --- a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-vcs-pro.yaml +++ b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-vcs-pro.yaml @@ -9,7 +9,7 @@ metadata: spec: chart: path: charts/travis-vcs - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: travis-vcs-pro values: diff --git a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-vcs.yaml b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-vcs.yaml index 72b10ded28..cc8d135bfb 100644 --- a/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-vcs.yaml +++ b/releases/gke_travis-ci-staging-services-1_us-central1_travis-ci-services/travis-vcs.yaml @@ -9,7 +9,7 @@ metadata: spec: chart: path: charts/travis-vcs - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: travis-vcs values: diff --git a/releases/gke_travis-staging-1_us-central1_workers-1/gcloud-cleanup.yaml b/releases/gke_travis-staging-1_us-central1_workers-1/gcloud-cleanup.yaml index faa64b25b2..722d79c40b 100644 --- a/releases/gke_travis-staging-1_us-central1_workers-1/gcloud-cleanup.yaml +++ b/releases/gke_travis-staging-1_us-central1_workers-1/gcloud-cleanup.yaml @@ -10,7 +10,7 @@ metadata: spec: chart: path: charts/gcloud-cleanup - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: gcloud-cleanup values: diff --git a/releases/gke_travis-staging-1_us-central1_workers-1/worker-com-free.yaml b/releases/gke_travis-staging-1_us-central1_workers-1/worker-com-free.yaml index 6c18a88014..653061bcac 100644 --- a/releases/gke_travis-staging-1_us-central1_workers-1/worker-com-free.yaml +++ b/releases/gke_travis-staging-1_us-central1_workers-1/worker-com-free.yaml @@ -6,7 +6,7 @@ metadata: spec: chart: path: charts/gce-worker - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: worker-com-free values: diff --git a/releases/gke_travis-staging-1_us-central1_workers-1/worker-com.yaml b/releases/gke_travis-staging-1_us-central1_workers-1/worker-com.yaml index 3e20ec6bc4..5ae641eab1 100644 --- a/releases/gke_travis-staging-1_us-central1_workers-1/worker-com.yaml +++ b/releases/gke_travis-staging-1_us-central1_workers-1/worker-com.yaml @@ -6,7 +6,7 @@ metadata: spec: chart: path: charts/gce-worker - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: worker-com values: diff --git a/releases/gke_travis-staging-1_us-central1_workers-1/worker-org-k8s-queue.yaml b/releases/gke_travis-staging-1_us-central1_workers-1/worker-org-k8s-queue.yaml index f6c7ae33db..74059361c1 100644 --- a/releases/gke_travis-staging-1_us-central1_workers-1/worker-org-k8s-queue.yaml +++ b/releases/gke_travis-staging-1_us-central1_workers-1/worker-org-k8s-queue.yaml @@ -6,7 +6,7 @@ metadata: spec: chart: path: charts/gce-worker - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: worker-org-k8s-queue values: diff --git a/releases/gke_travis-staging-1_us-central1_workers-1/worker-org-test-ue1.yaml b/releases/gke_travis-staging-1_us-central1_workers-1/worker-org-test-ue1.yaml index 942f9b3205..80027c8338 100644 --- a/releases/gke_travis-staging-1_us-central1_workers-1/worker-org-test-ue1.yaml +++ b/releases/gke_travis-staging-1_us-central1_workers-1/worker-org-test-ue1.yaml @@ -6,7 +6,7 @@ metadata: spec: chart: path: charts/gce-worker - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: worker-org-test-ue1 values: diff --git a/releases/gke_travis-staging-1_us-central1_workers-1/worker-org.yaml b/releases/gke_travis-staging-1_us-central1_workers-1/worker-org.yaml index 521306d8bf..398c83647e 100644 --- a/releases/gke_travis-staging-1_us-central1_workers-1/worker-org.yaml +++ b/releases/gke_travis-staging-1_us-central1_workers-1/worker-org.yaml @@ -6,7 +6,7 @@ metadata: spec: chart: path: charts/gce-worker - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: worker-org values: From 36dc8e4abf34d5eaa3cd943d8a68d543847d19fb Mon Sep 17 00:00:00 2001 From: Arek Rus Date: Wed, 19 Feb 2020 10:48:23 +0100 Subject: [PATCH 2/2] Replace repo urls --- releases/macstadium-staging/collectd-vsphere.yaml | 2 +- releases/macstadium-staging/jupiter-brain-com.yaml | 2 +- releases/macstadium-staging/jupiter-brain-org.yaml | 2 +- releases/macstadium-staging/statsd.yaml | 2 +- releases/macstadium-staging/vsphere-janitor.yaml | 2 +- releases/macstadium-staging/vsphere-monitor.yaml | 2 +- releases/macstadium-staging/worker-com.yaml | 2 +- releases/macstadium-staging/worker-org.yaml | 2 +- shared/install-flux.sh | 2 +- shared/update-staging.sh | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/releases/macstadium-staging/collectd-vsphere.yaml b/releases/macstadium-staging/collectd-vsphere.yaml index 83553492ba..ce5726b188 100644 --- a/releases/macstadium-staging/collectd-vsphere.yaml +++ b/releases/macstadium-staging/collectd-vsphere.yaml @@ -6,7 +6,7 @@ metadata: spec: chart: path: charts/collectd-vsphere - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: collectd-vsphere values: diff --git a/releases/macstadium-staging/jupiter-brain-com.yaml b/releases/macstadium-staging/jupiter-brain-com.yaml index a088c5ac7b..06aa3b970e 100644 --- a/releases/macstadium-staging/jupiter-brain-com.yaml +++ b/releases/macstadium-staging/jupiter-brain-com.yaml @@ -6,7 +6,7 @@ metadata: spec: chart: path: charts/jupiter-brain - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: jupiter-brain-com values: diff --git a/releases/macstadium-staging/jupiter-brain-org.yaml b/releases/macstadium-staging/jupiter-brain-org.yaml index 9255db0d86..a72a98289f 100644 --- a/releases/macstadium-staging/jupiter-brain-org.yaml +++ b/releases/macstadium-staging/jupiter-brain-org.yaml @@ -6,7 +6,7 @@ metadata: spec: chart: path: charts/jupiter-brain - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: jupiter-brain-org values: diff --git a/releases/macstadium-staging/statsd.yaml b/releases/macstadium-staging/statsd.yaml index a82397ee5b..5cc9863f65 100644 --- a/releases/macstadium-staging/statsd.yaml +++ b/releases/macstadium-staging/statsd.yaml @@ -6,7 +6,7 @@ metadata: spec: chart: path: charts/statsd - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: statsd values: diff --git a/releases/macstadium-staging/vsphere-janitor.yaml b/releases/macstadium-staging/vsphere-janitor.yaml index 9099e58004..68eaf325f3 100644 --- a/releases/macstadium-staging/vsphere-janitor.yaml +++ b/releases/macstadium-staging/vsphere-janitor.yaml @@ -6,7 +6,7 @@ metadata: spec: chart: path: charts/vsphere-janitor - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: vsphere-janitor values: diff --git a/releases/macstadium-staging/vsphere-monitor.yaml b/releases/macstadium-staging/vsphere-monitor.yaml index 1f89a25543..d8976aea59 100644 --- a/releases/macstadium-staging/vsphere-monitor.yaml +++ b/releases/macstadium-staging/vsphere-monitor.yaml @@ -6,7 +6,7 @@ metadata: spec: chart: path: charts/vsphere-monitor - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: vsphere-monitor values: diff --git a/releases/macstadium-staging/worker-com.yaml b/releases/macstadium-staging/worker-com.yaml index c4544f8275..c8d90619f2 100644 --- a/releases/macstadium-staging/worker-com.yaml +++ b/releases/macstadium-staging/worker-com.yaml @@ -6,7 +6,7 @@ metadata: spec: chart: path: charts/macstadium-worker - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: worker-com values: diff --git a/releases/macstadium-staging/worker-org.yaml b/releases/macstadium-staging/worker-org.yaml index 6b6f1661b9..74c3bbb046 100644 --- a/releases/macstadium-staging/worker-org.yaml +++ b/releases/macstadium-staging/worker-org.yaml @@ -6,7 +6,7 @@ metadata: spec: chart: path: charts/macstadium-worker - git: git@github.com:travis-ci/kubernetes-config.git + git: git@github.com:travis-infrastructure/kubernetes-config.git ref: staging releaseName: worker-org values: diff --git a/shared/install-flux.sh b/shared/install-flux.sh index 160e9f39a2..4fe2521d87 100755 --- a/shared/install-flux.sh +++ b/shared/install-flux.sh @@ -13,7 +13,7 @@ helm upgrade flux fluxcd/flux \ --set rbac.create=true \ --set helmOperator.create=true \ --set helmOperator.createCRD=true \ - --set git.url=git@github.com:travis-ci/kubernetes-config.git \ + --set git.url=git@github.com:travis-infrastructure/kubernetes-config.git \ --set git.branch="$BRANCH" \ --set "git.path=releases/$NAMESPACE" \ --set git.pollInterval=1m \ diff --git a/shared/update-staging.sh b/shared/update-staging.sh index 8c42e5c99c..f2da67b2b0 100755 --- a/shared/update-staging.sh +++ b/shared/update-staging.sh @@ -1,6 +1,6 @@ #!/bin/bash -GIT_URL="https://$GITHUB_TOKEN@github.com/travis-ci/kubernetes-config.git" +GIT_URL="https://$GITHUB_TOKEN@github.com/travis-infrastructure/kubernetes-config.git" merge_to_staging() { git fetch origin staging:staging @@ -21,7 +21,7 @@ merge_pr_to_staging() { } if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then - if [[ "$TRAVIS_PULL_REQUEST_SLUG" == "travis-ci/kubernetes-config" ]]; then + if [[ "$TRAVIS_PULL_REQUEST_SLUG" == "travis-infrastructure/kubernetes-config" ]]; then merge_pr_to_staging fi elif [[ "$TRAVIS_BRANCH" == "master" ]]; then