Skip to content

Instantly share code, notes, and snippets.

@advancedwebdeveloper

advancedwebdeveloper/contour-operator_aarch64.diff

Created March 30, 2021 22:19
Show Gist options
  • Save advancedwebdeveloper/b5f1c2acb2a29aa52ee8a0aa1a80fa1f to your computer and use it in GitHub Desktop.
Save advancedwebdeveloper/b5f1c2acb2a29aa52ee8a0aa1a80fa1f to your computer and use it in GitHub Desktop.
Download ZIP
Raw
contour-operator_aarch64.diff
diff --git a/Dockerfile b/Dockerfile
index 4e93c88..ab3ad25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILDPLATFORM=linux/amd64
+ARG BUILDPLATFORM=linux/arm64
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.16.2 as builder
diff --git a/Makefile b/Makefile
index 5faf10e..f4f78be 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ endif
CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/controller-gen
# Platforms to build the multi-arch image for.
-IMAGE_PLATFORMS ?= linux/amd64,linux/arm64
+IMAGE_PLATFORMS ?= linux/arm64
# Stash the ISO 8601 date. Note that the GMT offset is missing the :
# separator, but there doesn't seem to be a way to do that without
diff --git a/config/crd/contour/01-crds.yaml b/config/crd/contour/01-crds.yaml
index d9cbadd..fb4427f 100644
--- a/config/crd/contour/01-crds.yaml
+++ b/config/crd/contour/01-crds.yaml
@@ -61,7 +61,7 @@ spec:
type: string
type: object
protocol:
- description: Protocol may be used to specify (or override) the protocol used to reach this Service. Values may be tls, h2, h2c. If omitted, protocol-selection falls back on Service annotations.
+ description: Protocol may be used to specify (or override) the protocol used to reach this Service. Values may be h2 or h2c. If omitted, protocol-selection falls back on Service annotations.
enum:
- h2
- h2c
diff --git a/examples/gateway/kuard/kuard.yaml b/examples/gateway/kuard/kuard.yaml
index d942584..3aa87db 100644
--- a/examples/gateway/kuard/kuard.yaml
+++ b/examples/gateway/kuard/kuard.yaml
@@ -16,7 +16,7 @@ spec:
app: kuard
spec:
containers:
- - image: gcr.io/kuar-demo/kuard-amd64:1
+ - image: gcr.io/kuar-demo/kuard-arm64:1
name: kuard
---
apiVersion: v1
diff --git a/go.mod b/go.mod
index 836b4df..78ee5d0 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/projectcontour/contour-operator
-go 1.15
+go 1.16
diff --git a/Dockerfile b/Dockerfile
index 4e93c88..ab3ad25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILDPLATFORM=linux/amd64
+ARG BUILDPLATFORM=linux/arm64
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.16.2 as builder
diff --git a/Makefile b/Makefile
index 5faf10e..f4f78be 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ endif
CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/controller-gen
# Platforms to build the multi-arch image for.
-IMAGE_PLATFORMS ?= linux/amd64,linux/arm64
+IMAGE_PLATFORMS ?= linux/arm64
# Stash the ISO 8601 date. Note that the GMT offset is missing the :
# separator, but there doesn't seem to be a way to do that without
diff --git a/config/crd/contour/01-crds.yaml b/config/crd/contour/01-crds.yaml
index d9cbadd..fb4427f 100644
--- a/config/crd/contour/01-crds.yaml
+++ b/config/crd/contour/01-crds.yaml
@@ -61,7 +61,7 @@ spec:
type: string
type: object
protocol:
- description: Protocol may be used to specify (or override) the protocol used to reach this Service. Values may be tls, h2, h2c. If omitted, protocol-selec
tion falls back on Service annotations.
+ description: Protocol may be used to specify (or override) the protocol used to reach this Service. Values may be h2 or h2c. If omitted, protocol-selectio
n falls back on Service annotations.
enum:
- h2
- h2c
diff --git a/examples/gateway/kuard/kuard.yaml b/examples/gateway/kuard/kuard.yaml
index d942584..3aa87db 100644
--- a/examples/gateway/kuard/kuard.yaml
+++ b/examples/gateway/kuard/kuard.yaml
@@ -16,7 +16,7 @@ spec:
app: kuard
spec:
containers:
- - image: gcr.io/kuar-demo/kuard-amd64:1
+ - image: gcr.io/kuar-demo/kuard-arm64:1
name: kuard
---
:...skipping...
diff --git a/Dockerfile b/Dockerfile
index 4e93c88..ab3ad25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILDPLATFORM=linux/amd64
+ARG BUILDPLATFORM=linux/arm64
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.16.2 as builder
diff --git a/Makefile b/Makefile
index 5faf10e..f4f78be 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ endif
CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/controller-gen
# Platforms to build the multi-arch image for.
-IMAGE_PLATFORMS ?= linux/amd64,linux/arm64
+IMAGE_PLATFORMS ?= linux/arm64
# Stash the ISO 8601 date. Note that the GMT offset is missing the :
# separator, but there doesn't seem to be a way to do that without
diff --git a/config/crd/contour/01-crds.yaml b/config/crd/contour/01-crds.yaml
index d9cbadd..fb4427f 100644
--- a/config/crd/contour/01-crds.yaml
+++ b/config/crd/contour/01-crds.yaml
@@ -61,7 +61,7 @@ spec:
type: string
type: object
protocol:
- description: Protocol may be used to specify (or override) the protocol used to reach this Service. Values may be tls, h2, h2c. If omitted, protocol-selection falls back on Service annotations.
+ description: Protocol may be used to specify (or override) the protocol used to reach this Service. Values may be h2 or h2c. If omitted, protocol-selection falls back on Service annotations.
enum:
- h2
- h2c
diff --git a/examples/gateway/kuard/kuard.yaml b/examples/gateway/kuard/kuard.yaml
index d942584..3aa87db 100644
--- a/examples/gateway/kuard/kuard.yaml
+++ b/examples/gateway/kuard/kuard.yaml
@@ -16,7 +16,7 @@ spec:
app: kuard
spec:
containers:
- - image: gcr.io/kuar-demo/kuard-amd64:1
+ - image: gcr.io/kuar-demo/kuard-arm64:1
name: kuard
---
apiVersion: v1
diff --git a/go.mod b/go.mod
index 836b4df..78ee5d0 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/projectcontour/contour-operator
-go 1.15
+go 1.16
require (
github.com/docker/distribution v2.7.1+incompatible
:...skipping...
diff --git a/Dockerfile b/Dockerfile
index 4e93c88..ab3ad25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILDPLATFORM=linux/amd64
+ARG BUILDPLATFORM=linux/arm64
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.16.2 as builder
diff --git a/Makefile b/Makefile
index 5faf10e..f4f78be 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ endif
CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/controller-gen
# Platforms to build the multi-arch image for.
-IMAGE_PLATFORMS ?= linux/amd64,linux/arm64
+IMAGE_PLATFORMS ?= linux/arm64
# Stash the ISO 8601 date. Note that the GMT offset is missing the :
# separator, but there doesn't seem to be a way to do that without
diff --git a/config/crd/contour/01-crds.yaml b/config/crd/contour/01-crds.yaml
index d9cbadd..fb4427f 100644
--- a/config/crd/contour/01-crds.yaml
+++ b/config/crd/contour/01-crds.yaml
@@ -61,7 +61,7 @@ spec:
type: string
type: object
protocol:
- description: Protocol may be used to specify (or override) the protocol used to reach this Service. Values may be tls, h2, h2c. If omitted, protocol-selection falls back on Service annotations.
+ description: Protocol may be used to specify (or override) the protocol used to reach this Service. Values may be h2 or h2c. If omitted, protocol-selection falls back on Service annotations.
enum:
- h2
- h2c
diff --git a/examples/gateway/kuard/kuard.yaml b/examples/gateway/kuard/kuard.yaml
index d942584..3aa87db 100644
--- a/examples/gateway/kuard/kuard.yaml
+++ b/examples/gateway/kuard/kuard.yaml
@@ -16,7 +16,7 @@ spec:
app: kuard
spec:
containers:
- - image: gcr.io/kuar-demo/kuard-amd64:1
+ - image: gcr.io/kuar-demo/kuard-arm64:1
name: kuard
---
apiVersion: v1
diff --git a/go.mod b/go.mod
index 836b4df..78ee5d0 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/projectcontour/contour-operator
-go 1.15
+go 1.16
require (
github.com/docker/distribution v2.7.1+incompatible
diff --git a/hack/actions/install-kubernetes-toolchain.sh b/hack/actions/install-kubernetes-toolchain.sh
index 5382549..ea41d4a 100755
--- a/hack/actions/install-kubernetes-toolchain.sh
+++ b/hack/actions/install-kubernetes-toolchain.sh
@@ -40,24 +40,24 @@ esac
download \
:...skipping...
diff --git a/Dockerfile b/Dockerfile
index 4e93c88..ab3ad25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILDPLATFORM=linux/amd64
+ARG BUILDPLATFORM=linux/arm64
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.16.2 as builder
diff --git a/Makefile b/Makefile
index 5faf10e..f4f78be 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ endif
CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/controller-gen
# Platforms to build the multi-arch image for.
-IMAGE_PLATFORMS ?= linux/amd64,linux/arm64
+IMAGE_PLATFORMS ?= linux/arm64
# Stash the ISO 8601 date. Note that the GMT offset is missing the :
# separator, but there doesn't seem to be a way to do that without
diff --git a/config/crd/contour/01-crds.yaml b/config/crd/contour/01-crds.yaml
index d9cbadd..fb4427f 100644
--- a/config/crd/contour/01-crds.yaml
+++ b/config/crd/contour/01-crds.yaml
@@ -61,7 +61,7 @@ spec:
type: string
type: object
protocol:
- description: Protocol may be used to specify (or override) the protocol used to reach this Service. Values may be tls, h2, h2c. If omitted, protocol-selection falls back on Service annotations.
+ description: Protocol may be used to specify (or override) the protocol used to reach this Service. Values may be h2 or h2c. If omitted, protocol-selection falls back on Service annotations.
enum:
- h2
- h2c
diff --git a/examples/gateway/kuard/kuard.yaml b/examples/gateway/kuard/kuard.yaml
index d942584..3aa87db 100644
--- a/examples/gateway/kuard/kuard.yaml
+++ b/examples/gateway/kuard/kuard.yaml
@@ -16,7 +16,7 @@ spec:
app: kuard
spec:
containers:
- - image: gcr.io/kuar-demo/kuard-amd64:1
+ - image: gcr.io/kuar-demo/kuard-arm64:1
name: kuard
---
apiVersion: v1
diff --git a/go.mod b/go.mod
index 836b4df..78ee5d0 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/projectcontour/contour-operator
-go 1.15
+go 1.16
require (
github.com/docker/distribution v2.7.1+incompatible
diff --git a/hack/actions/install-kubernetes-toolchain.sh b/hack/actions/install-kubernetes-toolchain.sh
index 5382549..ea41d4a 100755
--- a/hack/actions/install-kubernetes-toolchain.sh
+++ b/hack/actions/install-kubernetes-toolchain.sh
@@ -40,24 +40,24 @@ esac
download \
- "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERS}/kind-${OS}-amd64" \
+ "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERS}/kind-${OS}-arm64" \
"${DESTDIR}/kind"
chmod +x "${DESTDIR}/kind"
download \
- "https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERS}/bin/${OS}/amd64/kubectl" \
+ "https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERS}/bin/${OS}/arm64/kubectl" \
"${DESTDIR}/kubectl"
chmod +x "${DESTDIR}/kubectl"
download \
- "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERS}/kustomize_${KUSTOMIZE_VERS}_${OS}_amd64.tar.gz" \
+ "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERS}/kustomize_${KUSTOMIZE_VERS}_${OS}_arm64.tar.gz" \
:...skipping...
diff --git a/Dockerfile b/Dockerfile
index 4e93c88..ab3ad25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILDPLATFORM=linux/amd64
+ARG BUILDPLATFORM=linux/arm64
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.16.2 as builder
diff --git a/Makefile b/Makefile
index 5faf10e..f4f78be 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ endif
CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/controller-gen
# Platforms to build the multi-arch image for.
-IMAGE_PLATFORMS ?= linux/amd64,linux/arm64
+IMAGE_PLATFORMS ?= linux/arm64
# Stash the ISO 8601 date. Note that the GMT offset is missing the :
# separator, but there doesn't seem to be a way to do that without
diff --git a/config/crd/contour/01-crds.yaml b/config/crd/contour/01-crds.yaml
index d9cbadd..fb4427f 100644
--- a/config/crd/contour/01-crds.yaml
+++ b/config/crd/contour/01-crds.yaml
@@ -61,7 +61,7 @@ spec:
type: string
type: object
protocol:
- description: Protocol may be used to specify (or override) the protocol used to reach this Service. Values may be tls, h2, h2c. If omitted, protocol-selection falls back on Service annotations.
+ description: Protocol may be used to specify (or override) the protocol used to reach this Service. Values may be h2 or h2c. If omitted, protocol-selection falls back on Service annotations.
enum:
- h2
- h2c
diff --git a/examples/gateway/kuard/kuard.yaml b/examples/gateway/kuard/kuard.yaml
index d942584..3aa87db 100644
--- a/examples/gateway/kuard/kuard.yaml
+++ b/examples/gateway/kuard/kuard.yaml
@@ -16,7 +16,7 @@ spec:
app: kuard
spec:
containers:
- - image: gcr.io/kuar-demo/kuard-amd64:1
+ - image: gcr.io/kuar-demo/kuard-arm64:1
name: kuard
---
apiVersion: v1
diff --git a/go.mod b/go.mod
index 836b4df..78ee5d0 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/projectcontour/contour-operator
-go 1.15
+go 1.16
require (
github.com/docker/distribution v2.7.1+incompatible
diff --git a/hack/actions/install-kubernetes-toolchain.sh b/hack/actions/install-kubernetes-toolchain.sh
index 5382549..ea41d4a 100755
--- a/hack/actions/install-kubernetes-toolchain.sh
+++ b/hack/actions/install-kubernetes-toolchain.sh
@@ -40,24 +40,24 @@ esac
download \
- "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERS}/kind-${OS}-amd64" \
+ "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERS}/kind-${OS}-arm64" \
"${DESTDIR}/kind"
chmod +x "${DESTDIR}/kind"
download \
- "https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERS}/bin/${OS}/amd64/kubectl" \
+ "https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERS}/bin/${OS}/arm64/kubectl" \
"${DESTDIR}/kubectl"
chmod +x "${DESTDIR}/kubectl"
download \
- "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERS}/kustomize_${KUSTOMIZE_VERS}_${OS}_amd64.tar.gz" \
+ "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERS}/kustomize_${KUSTOMIZE_VERS}_${OS}_arm64.tar.gz" \
"${DESTDIR}/kustomize.tgz"
tar -C "${DESTDIR}" -xf "${DESTDIR}/kustomize.tgz" kustomize
rm "${DESTDIR}/kustomize.tgz"
-curl -L https://go.kubebuilder.io/dl/${KUBEBUILDER_VERS}/${OS}/amd64 | tar -xz -C /tmp/
-mv /tmp/kubebuilder_${KUBEBUILDER_VERS}_${OS}_amd64 kubebuilder
+curl -L https://go.kubebuilder.io/dl/${KUBEBUILDER_VERS}/${OS}/arm64 | tar -xz -C /tmp/
+mv /tmp/kubebuilder_${KUBEBUILDER_VERS}_${OS}_arm64 kubebuilder
sudo mv kubebuilder /usr/local/
:...skipping...
diff --git a/Dockerfile b/Dockerfile
index 4e93c88..ab3ad25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILDPLATFORM=linux/amd64
+ARG BUILDPLATFORM=linux/arm64
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.16.2 as builder
diff --git a/Makefile b/Makefile
index 5faf10e..f4f78be 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ endif
CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/controller-gen
# Platforms to build the multi-arch image for.
-IMAGE_PLATFORMS ?= linux/amd64,linux/arm64
+IMAGE_PLATFORMS ?= linux/arm64
# Stash the ISO 8601 date. Note that the GMT offset is missing the :
# separator, but there doesn't seem to be a way to do that without
diff --git a/config/crd/contour/01-crds.yaml b/config/crd/contour/01-crds.yaml
index d9cbadd..fb4427f 100644
--- a/config/crd/contour/01-crds.yaml
+++ b/config/crd/contour/01-crds.yaml
@@ -61,7 +61,7 @@ spec:
type: string
type: object
protocol:
- description: Protocol may be used to specify (or override) the protocol used to reach this Service. Values may be tls, h2, h2c. If omitted, protocol-selection falls back on Service annotations.
+ description: Protocol may be used to specify (or override) the protocol used to reach this Service. Values may be h2 or h2c. If omitted, protocol-selection falls back on Service annotations.
enum:
- h2
- h2c
diff --git a/examples/gateway/kuard/kuard.yaml b/examples/gateway/kuard/kuard.yaml
index d942584..3aa87db 100644
--- a/examples/gateway/kuard/kuard.yaml
+++ b/examples/gateway/kuard/kuard.yaml
@@ -16,7 +16,7 @@ spec:
app: kuard
spec:
containers:
- - image: gcr.io/kuar-demo/kuard-amd64:1
+ - image: gcr.io/kuar-demo/kuard-arm64:1
name: kuard
---
apiVersion: v1
diff --git a/go.mod b/go.mod
index 836b4df..78ee5d0 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/projectcontour/contour-operator
-go 1.15
+go 1.16
require (
github.com/docker/distribution v2.7.1+incompatible
diff --git a/hack/actions/install-kubernetes-toolchain.sh b/hack/actions/install-kubernetes-toolchain.sh
index 5382549..ea41d4a 100755
--- a/hack/actions/install-kubernetes-toolchain.sh
+++ b/hack/actions/install-kubernetes-toolchain.sh
@@ -40,24 +40,24 @@ esac
download \
- "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERS}/kind-${OS}-amd64" \
+ "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERS}/kind-${OS}-arm64" \
"${DESTDIR}/kind"
chmod +x "${DESTDIR}/kind"
download \
- "https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERS}/bin/${OS}/amd64/kubectl" \
+ "https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERS}/bin/${OS}/arm64/kubectl" \
"${DESTDIR}/kubectl"
chmod +x "${DESTDIR}/kubectl"
download \
- "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERS}/kustomize_${KUSTOMIZE_VERS}_${OS}_amd64.tar.gz" \
+ "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERS}/kustomize_${KUSTOMIZE_VERS}_${OS}_arm64.tar.gz" \
"${DESTDIR}/kustomize.tgz"
tar -C "${DESTDIR}" -xf "${DESTDIR}/kustomize.tgz" kustomize
rm "${DESTDIR}/kustomize.tgz"
-curl -L https://go.kubebuilder.io/dl/${KUBEBUILDER_VERS}/${OS}/amd64 | tar -xz -C /tmp/
-mv /tmp/kubebuilder_${KUBEBUILDER_VERS}_${OS}_amd64 kubebuilder
+curl -L https://go.kubebuilder.io/dl/${KUBEBUILDER_VERS}/${OS}/arm64 | tar -xz -C /tmp/
+mv /tmp/kubebuilder_${KUBEBUILDER_VERS}_${OS}_arm64 kubebuilder
sudo mv kubebuilder /usr/local/
diff --git a/test/e2e/operator_test.go b/test/e2e/operator_test.go
index 3265e79..aed9b3d 100644
--- a/test/e2e/operator_test.go
+++ b/test/e2e/operator_test.go
@@ -68,7 +68,7 @@ var (
// testAppName is the name of the application used for e2e testing.
testAppName = "kuard"
// testAppImage is the image used by the e2e test application.
- testAppImage = "gcr.io/kuar-demo/kuard-amd64:1"
+ testAppImage = "gcr.io/kuar-demo/kuard-arm64:1"
// testAppReplicas is the number of replicas used for the e2e test application's
// deployment.
testAppReplicas = 3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment