Merge branch 'upstream/main' into filter-order-impl

envoyproxy · May 1, 2024 · e46dd33 · e46dd33
2 parents e7b276c + 90275f4
commit e46dd33
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 27 deletions.
diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
@@ -74,7 +74,7 @@ jobs:
       with:
         name: envoy-gateway
         path: bin/
-
+# Enable once https://github.com/tetrateio/gateway/issues/15 is completed
   conformance-test:
     runs-on: ubuntu-latest
     needs: [build]
@@ -97,11 +97,11 @@ jobs:
         chmod +x bin/linux/arm64/envoy-gateway
 
     # conformance
-    - name: Run Standard Conformance Tests
-      env:
-        KIND_NODE_TAG: ${{ matrix.version }}
-        IMAGE_PULL_POLICY: IfNotPresent
-      run: make conformance
+    #    - name: Run Standard Conformance Tests
+    #      env:
+    #        KIND_NODE_TAG: ${{ matrix.version }}
+    #        IMAGE_PULL_POLICY: IfNotPresent
+    #      run: make conformance
 
   e2e-test:
     runs-on: ubuntu-latest
@@ -125,11 +125,11 @@ jobs:
         chmod +x bin/linux/arm64/envoy-gateway
 
     # E2E
-    - name: Run E2E Tests
-      env:
-        KIND_NODE_TAG: ${{ matrix.version }}
-        IMAGE_PULL_POLICY: IfNotPresent
-      run: make e2e
+    #    - name: Run E2E Tests
+    #      env:
+    #        KIND_NODE_TAG: ${{ matrix.version }}
+    #        IMAGE_PULL_POLICY: IfNotPresent
+    #      run: make e2e
 
   publish:
     runs-on: ubuntu-latest
@@ -154,8 +154,8 @@ jobs:
       if: github.event_name == 'push'
       uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20  # v3.1.0
       with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+        username: ${{ secrets.TETRATE_DOCKERHUB_USER }}
+        password: ${{ secrets.TETRATE_DOCKERHUB_PASS }}
 
     - name: Setup Multiarch Environment
       if: github.event_name == 'push'
@@ -164,14 +164,14 @@ jobs:
     - name: Build and Push EG Commit Image
       if: github.event_name == 'push'
       # tag is set to the short SHA of the commit
-      run: make image.push.multiarch PLATFORMS="linux_amd64 linux_arm64" IMAGE=envoyproxy/gateway-dev
+      run: make image.push.multiarch PLATFORMS="linux_amd64 linux_arm64" IMAGE=tetrate/gateway-dev
 
     - name: Build and Push EG Latest Image
       if: github.event_name == 'push' && github.ref == 'refs/heads/main'
       # tag is set to `latest` when pushing to main branch
-      run: make image.push.multiarch TAG=latest PLATFORMS="linux_amd64 linux_arm64" IMAGE=envoyproxy/gateway-dev
+      run: make image.push.multiarch TAG=latest PLATFORMS="linux_amd64 linux_arm64" IMAGE=tetrate/gateway-dev
 
     - name: Build and Push EG Latest Helm Chart
       if: github.event_name == 'push' && github.ref == 'refs/heads/main'
       # use `0.0.0` as the default latest version.
-      run: OCI_REGISTRY=oci://docker.io/envoyproxy CHART_VERSION=v0.0.0-latest TAG=latest make helm-package helm-push
+      run: OCI_REGISTRY=oci://docker.io/tetrate CHART_VERSION=v0.0.0-latest TAG=latest make helm-package helm-push
diff --git a/.github/workflows/latest_release.yaml b/.github/workflows/latest_release.yaml
@@ -26,7 +26,7 @@ jobs:
     - uses: ./tools/github-actions/setup-deps
 
     - name: Generate Release Manifests
-      run: make generate-manifests IMAGE=envoyproxy/gateway-dev TAG=latest OUTPUT_DIR=release-artifacts
+      run: make generate-manifests IMAGE=tetrate/gateway-dev TAG=latest OUTPUT_DIR=release-artifacts
 
     - name: Build egctl latest multiarch binaries
       run: |
@@ -83,7 +83,7 @@ jobs:
           We use `v0.0.0-latest` as the latest chart version to install latest envoy-gateway:
 
           ```shell
-          helm install eg oci://docker.io/envoyproxy/gateway-helm --version v0.0.0-latest -n envoy-gateway-system --create-namespace
+          helm install eg oci://docker.io/tetrate/gateway-helm --version v0.0.0-latest -n envoy-gateway-system --create-namespace
           ```
 
           Try latest version of `egctl` with:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -27,17 +27,17 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20  # v3.1.0
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          username: ${{ secrets.TETRATE_DOCKERHUB_USER }}
+          password: ${{ secrets.TETRATE_DOCKERHUB_PASS }}
       - name: Retag and push existing gateway-dev image
         run: |
-          skopeo copy --all docker://docker.io/envoyproxy/gateway-dev:${{ env.sha_short }} docker://docker.io/envoyproxy/gateway:${{ env.release_tag }}
+          skopeo copy --all docker://docker.io/tetrate/gateway-dev:${{ env.sha_short }} docker://docker.io/tetrate/gateway:${{ env.release_tag }}
 
       - name: Generate Release Artifacts
         run: make generate-artifacts IMAGE=envoyproxy/gateway TAG=${{ env.release_tag }} OUTPUT_DIR=release-artifacts
 
       - name: Build and Push EG Release Helm Chart
-        run: OCI_REGISTRY=oci://docker.io/envoyproxy CHART_VERSION=${{ env.release_tag }} IMAGE=docker.io/envoyproxy/gateway TAG=${{ env.release_tag }} make helm-package helm-push
+        run: OCI_REGISTRY=oci://docker.io/tetrate CHART_VERSION=${{ env.release_tag }} IMAGE=docker.io/tetrate/gateway TAG=${{ env.release_tag }} make helm-package helm-push
 
       - name: Upload Release Manifests
         uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564  # v0.1.15

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -14,7 +14,7 @@ jobs:
     name: Prune Stale
     runs-on: ubuntu-22.04
     # do not run it in forked repos
-    if: github.repository == 'envoyproxy/gateway'
+    if: github.repository == 'tetrateio/gateway'
 
     steps:
     - name: Prune Stale

diff --git a/release-notes/v1.1.0-tetrate-rc.1.yaml b/release-notes/v1.1.0-tetrate-rc.1.yaml
@@ -0,0 +1,5 @@
+date: April 26, 2024
+
+changes:
+  - area: api
+      Added support for modifying http2 listener settings using ClientTrafficPolicy
diff --git a/test/helm/default.yaml b/test/helm/default.yaml
@@ -368,7 +368,7 @@ spec:
               fieldPath: metadata.namespace
         - name: KUBERNETES_CLUSTER_DOMAIN
           value: cluster.local
-        image: docker.io/envoyproxy/gateway-dev:latest
+        image: docker.io/tetrate/gateway-dev:latest
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -516,7 +516,7 @@ spec:
               fieldPath: metadata.namespace
         - name: KUBERNETES_CLUSTER_DOMAIN
           value: cluster.local
-        image: docker.io/envoyproxy/gateway-dev:latest
+        image: docker.io/tetrate/gateway-dev:latest
         imagePullPolicy: Always
         name: envoy-gateway-certgen
       restartPolicy: Never

diff --git a/tools/make/env.mk b/tools/make/env.mk
@@ -6,7 +6,7 @@
 # Docker variables
 
 # REGISTRY is the image registry to use for build and push image targets.
-REGISTRY ?= docker.io/envoyproxy
+REGISTRY ?= docker.io/tetrate
 # IMAGE_NAME is the name of EG image
 # Use gateway-dev in default when developing
 # Use gateway when releasing an image.

diff --git a/tools/make/helm.mk b/tools/make/helm.mk
@@ -4,7 +4,7 @@
 
 include tools/make/env.mk
 
-OCI_REGISTRY ?= oci://docker.io/envoyproxy
+OCI_REGISTRY ?= oci://docker.io/tetrate
 CHART_NAME ?= gateway-helm
 CHART_VERSION ?= ${RELEASE_VERSION}