diff --git a/.github/master-cluster/README.md b/.github/release-cluster/README.md similarity index 100% rename from .github/master-cluster/README.md rename to .github/release-cluster/README.md diff --git a/.github/master-cluster/frontend-ingress.yaml b/.github/release-cluster/frontend-ingress.yaml similarity index 55% rename from .github/master-cluster/frontend-ingress.yaml rename to .github/release-cluster/frontend-ingress.yaml index b18ddea7b41..beb50e8d682 100644 --- a/.github/master-cluster/frontend-ingress.yaml +++ b/.github/release-cluster/frontend-ingress.yaml @@ -3,8 +3,8 @@ kind: Ingress metadata: name: frontend-ingress annotations: - kubernetes.io/ingress.global-static-ip-name: ob-global-ip - networking.gke.io/managed-certificates: ob-cert + kubernetes.io/ingress.global-static-ip-name: online-boutique-ip + networking.gke.io/managed-certificates: online-boutique-certificate spec: backend: serviceName: frontend-nodeport diff --git a/.github/master-cluster/frontend-nodeport.yaml b/.github/release-cluster/frontend-nodeport.yaml similarity index 100% rename from .github/master-cluster/frontend-nodeport.yaml rename to .github/release-cluster/frontend-nodeport.yaml diff --git a/.github/master-cluster/managed-cert.yaml b/.github/release-cluster/managed-cert.yaml similarity index 52% rename from .github/master-cluster/managed-cert.yaml rename to .github/release-cluster/managed-cert.yaml index fa2c9fa10ff..46bde7d82fc 100644 --- a/.github/master-cluster/managed-cert.yaml +++ b/.github/release-cluster/managed-cert.yaml @@ -1,7 +1,7 @@ -apiVersion: networking.gke.io/v1beta2 +apiVersion: networking.gke.io/v1 kind: ManagedCertificate metadata: - name: ob-cert + name: online-boutique-certificate spec: domains: - onlineboutique.dev diff --git a/.github/workflows/install-dependencies.sh b/.github/workflows/install-dependencies.sh index 0161841d737..60aa83545bc 100644 --- a/.github/workflows/install-dependencies.sh +++ b/.github/workflows/install-dependencies.sh @@ -37,6 +37,21 @@ echo "✅ dotnet installed" sudo apt-get install -yqq kubectl git echo "✅ kubectl installed" +# install go +wget https://golang.org/dl/go1.17.5.linux-amd64.tar.gz +sudo tar -C /usr/local -xzf go1.17.5.linux-amd64.tar.gz +echo 'export GOPATH=$HOME/go' >> ~/.profile +echo 'export PATH=$PATH:/usr/local/go/bin:$GOPATH/bin' >> ~/.profile +source ~/.profile +echo "✅ golang installed" + +# install build-essential (gcc, used for go test) +sudo apt install -y build-essential + +# install addlicense +go install github.com/google/addlicense@latest +sudo ln -s $HOME/go/bin/addlicense /bin + # install build-essential (gcc, used for go test) sudo apt install -y build-essential diff --git a/hack/README.md b/hack/README.md index fc646342948..dfa32d812de 100755 --- a/hack/README.md +++ b/hack/README.md @@ -47,15 +47,16 @@ export REPO_PREFIX=gcr.io/google-samples/microservices-demo #### 8. Once your pull-request is approved, merge it. -#### 9. Connect to our [onlineboutique-master GKE cluster](https://pantheon.corp.google.com/kubernetes/clusters/details/us-central1-c/online-boutique-master/details?project=onlineboutique-ci) +#### 9. Connect to our [online-boutique-release GKE cluster](https://pantheon.corp.google.com/kubernetes/clusters/details/us-central1-c/online-boutique-release/details?project=online-boutique-ci) - To do this, you can use: ``` -gcloud container clusters get-credentials online-boutique-master \ - --zone us-central1-c --project onlineboutique-ci +gcloud container clusters get-credentials online-boutique-release \ + --zone us-central1-c --project online-boutique-ci ``` -#### 10. Deploy `release/kubernetes-manifests.yaml` to our [onlineboutique-master GKE cluster](https://pantheon.corp.google.com/kubernetes/clusters/details/us-central1-c/online-boutique-master/details?project=onlineboutique-ci). +#### 10. Deploy `release/kubernetes-manifests.yaml` to our [online-boutique-release GKE cluster](https://pantheon.corp.google.com/kubernetes/clusters/details/us-central1-c/online-boutique-release/details?project=online-boutique-ci). + ``` kubectl apply -f ./release/kubernetes-manifests.yaml