Clean up diff

hashicorp · Jun 2, 2023 · fd56a66 · fd56a66
1 parent 5e809d3
commit fd56a66
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 3 deletions.
diff --git a/.changelog/2170.txt b/.changelog/2170.txt
@@ -1,3 +1,2 @@
 ```release-note:feature
 Add support for configuring global level server rate limiting.
-```
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -302,7 +302,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        arch: [ "amd64", "arm64" ]
+        arch: [ "amd64" ]
     env:
       repo: ${{ github.event.repository.name }}
       version: ${{ needs.get-product-version.outputs.product-version }}

diff --git a/control-plane/api-gateway/gatekeeper/init.go b/control-plane/api-gateway/gatekeeper/init.go
@@ -173,7 +173,6 @@ func initContainer(config common.HelmConfig, name, namespace string) (corev1.Con
 			})
 	}
 
-	// TODO This is violating the SecurityContextConstraints when config.EnableOpenShift
 	container.SecurityContext = &corev1.SecurityContext{
 		RunAsUser:    pointer.Int64(initContainersUserAndGroupID),
 		RunAsGroup:   pointer.Int64(initContainersUserAndGroupID),

diff --git a/control-plane/dist/cni/linux/arm64/consul-cni b/control-plane/dist/cni/linux/arm64/consul-cni
diff --git a/control-plane/dist/linux/arm64/consul-k8s-control-plane b/control-plane/dist/linux/arm64/consul-k8s-control-plane