Merge pull request #4217 from emissary-ingress/ci/repatriate/from-v2.…

…3-to-v2.4 [v3.0] Repatriate from v2.3
emissary-ingress · May 18, 2022 · c32a044 · c32a044
2 parents ab3bfa3 + d0cec18
commit c32a044
Show file tree

Hide file tree

Showing 186 changed files with 38,732 additions and 3,976 deletions.
diff --git a/.github/workflows/promote-ga.yml b/.github/workflows/promote-ga.yml
@@ -70,7 +70,7 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
         with:
           status: ${{ job.status }}
-          success_text: 'Emissary GitHub release was created: ${{ steps.step-create-gh-release.url }}'
+          success_text: 'Emissary GitHub release was created: ${{ steps.step-create-gh-release.outputs.url }}'
           failure_text: 'Emissary GitHub release failed'
           cancelled_text: 'Emissary GitHub release was was cancelled'
           fields: |

diff --git a/.github/workflows/promote-rc.yml b/.github/workflows/promote-rc.yml
@@ -42,8 +42,8 @@ jobs:
           success_text: |
             Emissary RC for ${{ github.ref }} successfully built:
             \`\`\`
-            export AMBASSADOR_MANIFEST_URL=https://app.getambassador.io/yaml/emissary/${{ steps.step-main.version }}
-            export HELM_CHART_VERSION=${{ steps.step-main.chart_version }}
+            export AMBASSADOR_MANIFEST_URL=https://app.getambassador.io/yaml/emissary/${{ steps.step-main.outputs.version }}
+            export HELM_CHART_VERSION=${{ steps.step-main.outputs.chart_version }}
             \`\`\`
           failure_text: '${env.GITHUB_WORKFLOW} (${env.GITHUB_RUN_NUMBER}) build failed'
           cancelled_text: '${env.GITHUB_WORKFLOW} (${env.GITHUB_RUN_NUMBER}) build was cancelled'

diff --git a/.github/workflows/publish-chart.yml b/.github/workflows/publish-chart.yml
@@ -65,7 +65,7 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
         with:
           status: ${{ job.status }}
-          success_text: 'Chart GitHub release was created: ${{ steps.step-create-gh-release.url }}'
+          success_text: 'Chart GitHub release was created: ${{ steps.step-create-gh-release.outputs.url }}'
           failure_text: 'Chart GitHub release failed'
           cancelled_text: 'Chart GitHub release was was cancelled'
           fields: |

diff --git a/.github/workflows/repatriate.yml b/.github/workflows/repatriate.yml
@@ -27,7 +27,7 @@ jobs:
 
           this_ver=${GITHUB_REF##*/}
           this_branch=release/${this_ver}
-          echo "::set-output this_branch=${this_branch}"
+          echo "::set-output name=this_branch::${this_branch}"
 
           next_ver=$(git for-each-ref --format='%(refname:lstrip=4)' 'refs/remotes/origin/release/v*' | sort --version-sort | grep -A1 -Fx "$this_ver" | sed 1d)
           if test -n "$next_ver"; then
@@ -36,31 +36,40 @@ jobs:
             next_ver="${this_ver%.*}.$((${this_ver##*.}+1))"
             next_branch='master'
           fi
-          echo "::set-output next_branch=${next_branch}"
+          echo "::set-output name=next_branch::${next_branch}"
 
           merge_branch="ci/repatriate/from-${this_ver}-to-${next_ver}"
           if git checkout "$merge_branch"; then
-            # PR already exists; update it.
+            # branch already exists; update it.
             git merge "$this_branch"
             git push origin "$merge_branch"
           else
-            # PR does not yet exist.
+            # branch does not yet exist.
             git checkout -b "$merge_branch"
             git push --set-upstream origin "$merge_branch"
+          fi
+
+          if url=$(gh pr view --json=url --jq=.url); then
+            echo "::set-output name=verb::Updated"
+          else
             gh pr create \
               --title="[${next_ver}] Repatriate from ${this_ver}" \
               --body="This PR merges ${this_branch} in to ${next_branch}." \
               --base="$next_branch"
+            url=$(gh pr view --json=url --jq=.url)
+            echo "::set-output name=verb::Created"
           fi
+          echo "::set-output name=pr_url::${url}"
       - name: Slack notification
         if: always()
         uses: edge/simple-slack-notify@master
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
         with:
           status: ${{ job.status }}
-          success_text: "Created repatriation PR merging ${{ steps.step-create-pr.this_branch }} in to ${{ steps.step-create-pr.next_branch }}"
+          success_text: "${{ steps.step-create-pr.outputs.verb }} repatriation PR merging ${{ steps.step-create-pr.outputs.this_branch }} in to ${{ steps.step-create-pr.outputs.next_branch }}"
           failure_text: "Creation of repatriation PR failed"
           fields: |
             [{ "title": "Repository", "value": "${{ github.repository }}", "short": true },
-             { "title": "Branch", "value": "${{ github.ref }}", "short": true}]
+             { "title": "Branch", "value": "${{ github.ref }}", "short": true},
+             { "title": "Pull Request", "value": "${{ steps.step-create-pr.outputs.pr_url }}"}]
diff --git a/.gitignore b/.gitignore
@@ -115,9 +115,3 @@ ambassador-secrets-deployment.yaml
 # 2022-01-31
 /docker/container.txt
 /docker/container.txt.stamp
-# 2020-08-20
-/cxx/envoy/
-/cxx/envoy-static
-/cxx/envoy-build-image.txt
-/cxx/envoy-build-container.txt
-/cxx/go-control-plane/
diff --git a/.golangci.yml b/.golangci.yml
@@ -31,7 +31,7 @@ linters-settings:
       - "(net/http.ResponseWriter).Write"
 issues:
   exclude-rules:
-    - linters: [govet, errcheck]
+    - linters: [govet, errcheck, unused]
       path: pkg/envoy-control-plane/
     - linters: [depguard]
       path: "pkg/envoy-control-plane/(test/|.*_test\\.go)"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1678,11 +1678,11 @@ NOTE: this switches the default regex engine! See the documentation for the `amb
 - Bugfix: Prevent spurious duplicate-resource errors when loading config from the filesystem
 
 [#1255]: https://github.com/datawire/ambassador/issues/1255
-[#1292]: https://github.com/datawire/ambassador/issuse/1292
+[#1292]: https://github.com/datawire/ambassador/issues/1292
 [#1461]: https://github.com/datawire/ambassador/issues/1461
-[#1578]: https://github.com/datawire/ambassador/issuse/1578
-[#1579]: https://github.com/datawire/ambassador/issuse/1579
-[#1594]: https://github.com/datawire/ambassador/issuse/1594
+[#1578]: https://github.com/datawire/ambassador/issues/1578
+[#1579]: https://github.com/datawire/ambassador/issues/1579
+[#1594]: https://github.com/datawire/ambassador/issues/1594
 [#1622]: https://github.com/datawire/ambassador/issues/1622
 [#1625]: https://github.com/datawire/ambassador/issues/1625
 

diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
@@ -22,6 +22,7 @@ following Free and Open Source software:
     github.com/armon/go-metrics                                                                v0.3.10                                      MIT license
     github.com/asaskevich/govalidator                                                          v0.0.0-20210307081110-f21760c49a8d           MIT license
     github.com/census-instrumentation/opencensus-proto                                         v0.3.0                                       Apache License 2.0
+    github.com/chai2010/gettext-go                                                             v0.0.0-20160711120539-c6fed771bfd5           3-clause BSD license
     github.com/cncf/udpa/go                                                                    v0.0.0-20220112060539-c52dc94e7fbe           Apache License 2.0
     github.com/cncf/xds/go                                                                     v0.0.0-20220121163655-4a2b9fdd466b           Apache License 2.0
     github.com/datawire/dlib                                                                   v1.2.5-0.20211116212847-0316f8d7af2b         Apache License 2.0
@@ -66,9 +67,9 @@ following Free and Open Source software:
     github.com/huandu/xstrings                                                                 v1.3.2                                       MIT license
     github.com/imdario/mergo                                                                   v0.3.12                                      3-clause BSD license
     github.com/inconshreveable/mousetrap                                                       v1.0.0                                       Apache License 2.0
+    github.com/jonboulle/clockwork                                                             v0.1.0                                       Apache License 2.0
     github.com/josharian/intern                                                                v1.0.1-0.20211109044230-42b52b674af5         MIT license
     github.com/json-iterator/go                                                                v1.1.12                                      MIT license
-    github.com/kballard/go-shellquote                                                          v0.0.0-20180428030007-95032a82bc51           MIT license
     github.com/liggitt/tabwriter                                                               v0.0.0-20181228230101-89fcab3d43de           3-clause BSD license
     github.com/mailru/easyjson                                                                 v0.7.7                                       MIT license
     github.com/mattn/go-colorable                                                              v0.1.12                                      MIT license

diff --git a/Makefile b/Makefile
@@ -81,7 +81,7 @@ deploy: push preflight-cluster
 	$(MAKE) deploy-only
 .PHONY: deploy
 
-deploy-only: preflight-dev-kubeconfig $(tools/kubectl) $(OSS_HOME)/manifests/emissary/emissary-crds.yaml $(boguschart_dir)
+deploy-only: preflight-dev-kubeconfig $(tools/kubectl) build-output/yaml-$(patsubst v%,%,$(VERSION)) $(boguschart_dir)
 	mkdir -p $(OSS_HOME)/build/helm/ && \
 	($(tools/kubectl) --kubeconfig $(DEV_KUBECONFIG) create ns ambassador || true) && \
 	helm template ambassador --output-dir $(OSS_HOME)/build/helm -n ambassador $(boguschart_dir) \
@@ -90,7 +90,7 @@ deploy-only: preflight-dev-kubeconfig $(tools/kubectl) $(OSS_HOME)/manifests/emi
 		--set replicaCount=1 \
 		--set enableAES=false \
 		--set image.fullImageOverride=$$(sed -n 2p docker/$(LCNAME).docker.push.remote) && \
-	$(tools/kubectl) --kubeconfig $(DEV_KUBECONFIG) apply -f $(OSS_HOME)/manifests/emissary/emissary-crds.yaml && \
+	$(tools/kubectl) --kubeconfig $(DEV_KUBECONFIG) apply -f build-output/yaml-$(patsubst v%,%,$(VERSION))/emissary-crds.yaml
 	$(tools/kubectl) --kubeconfig $(DEV_KUBECONFIG) -n emissary-system wait --for condition=available --timeout=90s deploy emissary-apiext && \
 	$(tools/kubectl) --kubeconfig $(DEV_KUBECONFIG) apply -f $(OSS_HOME)/build/helm/emissary-ingress/templates && \
 	rm -rf $(OSS_HOME)/build/helm