Merge pull request #620 from appscode-cloud/gw-arm

Signed-off-by: Tamal Saha <[email protected]>
appscode-cloud · Dec 11, 2024 · f97df88 · f97df88
2 parents 32df89e + df36f8f
commit f97df88
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 9 deletions.
diff --git a/apis/installer/v1alpha1/ingress_nginx_types.go b/apis/installer/v1alpha1/ingress_nginx_types.go
@@ -63,6 +63,8 @@ type IngressNginxDefaultBackend struct {
 
 type IngressNginxDefaultBackendImage struct {
 	Registry string `json:"registry"`
+	Image    string `json:"image"`
+	Tag      string `json:"tag"`
 }
 
 type IngressNginxController struct {

diff --git a/catalog/README.md b/catalog/README.md
@@ -365,7 +365,7 @@
 | rancher/kine:v0.11.4<br>sha256:12889bbcd1e83068db399abd1e4f19be76ad1b8bd597085e78e55065dd04ece7                                                                           | alpine 3.18.6               | 0, 1                    | 0, 4                | 20, 12                | 4, 1               | 0, 0                   |
 | registry.k8s.io/autoscaling/cluster-autoscaler:v1.27.1<br>sha256:0d93e3601aee4bd9e8b5e06c4bb3668c59a7d3b41b64e74982996dbacf0965a3                                         | debian 11.6                 | 0, 2                    | 0, 17               | 0, 24                 | 0, 2               | 1, 0                   |
 | registry.k8s.io/csi-secrets-store/driver:v1.4.1<br>sha256:450dea7f96b324261d5ac2de9b319580bd2d7107b13a06536fa6ce6106fc8ff2                                                | debian 12.4                 | 0, 1                    | **22**, 2           | 28, 11                | 6, 0               | 0, 0                   |
-| registry.k8s.io/defaultbackend-amd64:1.5<br>sha256:4dc5e07c8ca4e23bddb3153737d7b8c556e5fb2f29c4558b7cd6e6df99c512c7                                                       |                             | 0, 0                    | 0, 0                | 0, 0                  | 0, 0               | 0, 0                   |
+| ghcr.io/voyagermesh/defaultbackend:1.5<br>sha256:4dc5e07c8ca4e23bddb3153737d7b8c556e5fb2f29c4558b7cd6e6df99c512c7                                                       |                             | 0, 0                    | 0, 0                | 0, 0                  | 0, 0               | 0, 0                   |
 | registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6<br>sha256:4d99688e557396f5baa150e019ff7d5b7334f9b9f9a8dab64038c5c2a006f6b5   | debian 11.6                 | 0, 3                    | 0, 18               | 0, 21                 | 0, 0               | 1, 0                   |
 | registry.k8s.io/kube-apiserver:v1.30.2<br>sha256:340ab4a1d66a60630a7a298aa0b2576fcd82e51ecdddb751cf61e5d3846fde2d                                                         | debian 12.5                 | 0, 0                    | 0, 3                | 0, 6                  | 0, 0               | 0, 0                   |
 | registry.k8s.io/kube-controller-manager:v1.30.2<br>sha256:4c412bc1fc585ddeba10d34a02e7507ea787ec2c57256d4c18fd230377ab048e                                                | debian 12.5                 | 0, 0                    | 0, 3                | 0, 7                  | 0, 0               | 0, 0                   |

diff --git a/catalog/ace.yaml b/catalog/ace.yaml
@@ -101,6 +101,7 @@
 - ghcr.io/kyverno/kyvernopre:v1.12.5
 - ghcr.io/kyverno/reports-controller:v1.12.5
 - ghcr.io/loft-sh/vcluster-oss:0.20.0
+- ghcr.io/voyagermesh/defaultbackend:1.5
 - ghcr.io/voyagermesh/echoserver:v20221109
 - ghcr.io/voyagermesh/envoy:v1.31.2-ac
 - ghcr.io/voyagermesh/gateway-converter:v0.0.1
@@ -129,7 +130,6 @@
 - rancher/kine:v0.11.4
 - registry.k8s.io/autoscaling/cluster-autoscaler:v1.27.1
 - registry.k8s.io/csi-secrets-store/driver:v1.4.1
-- registry.k8s.io/defaultbackend-amd64:1.5
 - registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6
 - registry.k8s.io/kube-apiserver:v1.30.2
 - registry.k8s.io/kube-controller-manager:v1.30.2

diff --git a/catalog/copy-images.sh b/catalog/copy-images.sh
@@ -371,6 +371,7 @@ $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kyverno/kyverno:v1
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kyverno/kyvernopre:v1.12.5 $IMAGE_REGISTRY/kyverno/kyvernopre:v1.12.5
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kyverno/reports-controller:v1.12.5 $IMAGE_REGISTRY/kyverno/reports-controller:v1.12.5
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/loft-sh/vcluster-oss:0.20.0 $IMAGE_REGISTRY/loft-sh/vcluster-oss:0.20.0
+$CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/voyagermesh/defaultbackend:1.5 $IMAGE_REGISTRY/voyagermesh/defaultbackend:1.5
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/voyagermesh/echoserver:v20221109 $IMAGE_REGISTRY/voyagermesh/echoserver:v20221109
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/voyagermesh/envoy:v1.31.2-ac $IMAGE_REGISTRY/voyagermesh/envoy:v1.31.2-ac
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/voyagermesh/gateway-converter:v0.0.1 $IMAGE_REGISTRY/voyagermesh/gateway-converter:v0.0.1
@@ -399,7 +400,6 @@ $CMD cp --allow-nondistributable-artifacts --insecure rabbitmq:3.12.1-management
 $CMD cp --allow-nondistributable-artifacts --insecure rancher/kine:v0.11.4 $IMAGE_REGISTRY/rancher/kine:v0.11.4
 $CMD cp --allow-nondistributable-artifacts --insecure registry.k8s.io/autoscaling/cluster-autoscaler:v1.27.1 $IMAGE_REGISTRY/autoscaling/cluster-autoscaler:v1.27.1
 $CMD cp --allow-nondistributable-artifacts --insecure registry.k8s.io/csi-secrets-store/driver:v1.4.1 $IMAGE_REGISTRY/csi-secrets-store/driver:v1.4.1
-$CMD cp --allow-nondistributable-artifacts --insecure registry.k8s.io/defaultbackend-amd64:1.5 $IMAGE_REGISTRY/defaultbackend-amd64:1.5
 $CMD cp --allow-nondistributable-artifacts --insecure registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6 $IMAGE_REGISTRY/ingress-nginx/kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6
 $CMD cp --allow-nondistributable-artifacts --insecure registry.k8s.io/kube-apiserver:v1.30.2 $IMAGE_REGISTRY/kube-apiserver:v1.30.2
 $CMD cp --allow-nondistributable-artifacts --insecure registry.k8s.io/kube-controller-manager:v1.30.2 $IMAGE_REGISTRY/kube-controller-manager:v1.30.2

diff --git a/catalog/export-images.sh b/catalog/export-images.sh
@@ -368,6 +368,7 @@ $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kyverno/kyverno:
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kyverno/kyvernopre:v1.12.5 images/kyverno-kyvernopre-v1.12.5.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kyverno/reports-controller:v1.12.5 images/kyverno-reports-controller-v1.12.5.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/loft-sh/vcluster-oss:0.20.0 images/loft-sh-vcluster-oss-0.20.0.tar
+$CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/voyagermesh/defaultbackend:1.5 images/voyagermesh-defaultbackend-1.5.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/voyagermesh/echoserver:v20221109 images/voyagermesh-echoserver-v20221109.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/voyagermesh/envoy:v1.31.2-ac images/voyagermesh-envoy-v1.31.2-ac.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/voyagermesh/gateway-converter:v0.0.1 images/voyagermesh-gateway-converter-v0.0.1.tar
@@ -396,7 +397,6 @@ $CMD pull --allow-nondistributable-artifacts --insecure rabbitmq:3.12.1-manageme
 $CMD pull --allow-nondistributable-artifacts --insecure rancher/kine:v0.11.4 images/rancher-kine-v0.11.4.tar
 $CMD pull --allow-nondistributable-artifacts --insecure registry.k8s.io/autoscaling/cluster-autoscaler:v1.27.1 images/autoscaling-cluster-autoscaler-v1.27.1.tar
 $CMD pull --allow-nondistributable-artifacts --insecure registry.k8s.io/csi-secrets-store/driver:v1.4.1 images/csi-secrets-store-driver-v1.4.1.tar
-$CMD pull --allow-nondistributable-artifacts --insecure registry.k8s.io/defaultbackend-amd64:1.5 images/defaultbackend-amd64-1.5.tar
 $CMD pull --allow-nondistributable-artifacts --insecure registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6 images/ingress-nginx-kube-webhook-certgen-v20221220-controller-v1.5.1-58-g787ea74b6.tar
 $CMD pull --allow-nondistributable-artifacts --insecure registry.k8s.io/kube-apiserver:v1.30.2 images/kube-apiserver-v1.30.2.tar
 $CMD pull --allow-nondistributable-artifacts --insecure registry.k8s.io/kube-controller-manager:v1.30.2 images/kube-controller-manager-v1.30.2.tar

diff --git a/catalog/import-images.sh b/catalog/import-images.sh
@@ -362,6 +362,7 @@ $CMD push --allow-nondistributable-artifacts --insecure images/kyverno-kyverno-v
 $CMD push --allow-nondistributable-artifacts --insecure images/kyverno-kyvernopre-v1.12.5.tar $IMAGE_REGISTRY/kyverno/kyvernopre:v1.12.5
 $CMD push --allow-nondistributable-artifacts --insecure images/kyverno-reports-controller-v1.12.5.tar $IMAGE_REGISTRY/kyverno/reports-controller:v1.12.5
 $CMD push --allow-nondistributable-artifacts --insecure images/loft-sh-vcluster-oss-0.20.0.tar $IMAGE_REGISTRY/loft-sh/vcluster-oss:0.20.0
+$CMD push --allow-nondistributable-artifacts --insecure images/voyagermesh-defaultbackend-1.5.tar $IMAGE_REGISTRY/voyagermesh/defaultbackend:1.5
 $CMD push --allow-nondistributable-artifacts --insecure images/voyagermesh-echoserver-v20221109.tar $IMAGE_REGISTRY/voyagermesh/echoserver:v20221109
 $CMD push --allow-nondistributable-artifacts --insecure images/voyagermesh-envoy-v1.31.2-ac.tar $IMAGE_REGISTRY/voyagermesh/envoy:v1.31.2-ac
 $CMD push --allow-nondistributable-artifacts --insecure images/voyagermesh-gateway-converter-v0.0.1.tar $IMAGE_REGISTRY/voyagermesh/gateway-converter:v0.0.1
@@ -390,7 +391,6 @@ $CMD push --allow-nondistributable-artifacts --insecure images/library-rabbitmq-
 $CMD push --allow-nondistributable-artifacts --insecure images/rancher-kine-v0.11.4.tar $IMAGE_REGISTRY/rancher/kine:v0.11.4
 $CMD push --allow-nondistributable-artifacts --insecure images/autoscaling-cluster-autoscaler-v1.27.1.tar $IMAGE_REGISTRY/autoscaling/cluster-autoscaler:v1.27.1
 $CMD push --allow-nondistributable-artifacts --insecure images/csi-secrets-store-driver-v1.4.1.tar $IMAGE_REGISTRY/csi-secrets-store/driver:v1.4.1
-$CMD push --allow-nondistributable-artifacts --insecure images/defaultbackend-amd64-1.5.tar $IMAGE_REGISTRY/defaultbackend-amd64:1.5
 $CMD push --allow-nondistributable-artifacts --insecure images/ingress-nginx-kube-webhook-certgen-v20221220-controller-v1.5.1-58-g787ea74b6.tar $IMAGE_REGISTRY/ingress-nginx/kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6
 $CMD push --allow-nondistributable-artifacts --insecure images/kube-apiserver-v1.30.2.tar $IMAGE_REGISTRY/kube-apiserver:v1.30.2
 $CMD push --allow-nondistributable-artifacts --insecure images/kube-controller-manager-v1.30.2.tar $IMAGE_REGISTRY/kube-controller-manager:v1.30.2

diff --git a/catalog/import-into-k3s.sh b/catalog/import-into-k3s.sh
@@ -360,6 +360,7 @@ k3s ctr images import images/kyverno-kyverno-v1.12.5.tar
 k3s ctr images import images/kyverno-kyvernopre-v1.12.5.tar
 k3s ctr images import images/kyverno-reports-controller-v1.12.5.tar
 k3s ctr images import images/loft-sh-vcluster-oss-0.20.0.tar
+k3s ctr images import images/voyagermesh-defaultbackend-1.5.tar
 k3s ctr images import images/voyagermesh-echoserver-v20221109.tar
 k3s ctr images import images/voyagermesh-envoy-v1.31.2-ac.tar
 k3s ctr images import images/voyagermesh-gateway-converter-v0.0.1.tar
@@ -388,7 +389,6 @@ k3s ctr images import images/library-rabbitmq-3.12.1-management.tar
 k3s ctr images import images/rancher-kine-v0.11.4.tar
 k3s ctr images import images/autoscaling-cluster-autoscaler-v1.27.1.tar
 k3s ctr images import images/csi-secrets-store-driver-v1.4.1.tar
-k3s ctr images import images/defaultbackend-amd64-1.5.tar
 k3s ctr images import images/ingress-nginx-kube-webhook-certgen-v20221220-controller-v1.5.1-58-g787ea74b6.tar
 k3s ctr images import images/kube-apiserver-v1.30.2.tar
 k3s ctr images import images/kube-controller-manager-v1.30.2.tar

diff --git a/catalog/sync-gcp-mp-images.sh b/catalog/sync-gcp-mp-images.sh
@@ -126,6 +126,7 @@ crane cp --allow-nondistributable-artifacts ghcr.io/kyverno/kyverno:v1.12.5 $IMA
 crane cp --allow-nondistributable-artifacts ghcr.io/kyverno/kyvernopre:v1.12.5 $IMAGE_REGISTRY/kyvernopre:$TAG
 crane cp --allow-nondistributable-artifacts ghcr.io/kyverno/reports-controller:v1.12.5 $IMAGE_REGISTRY/reports-controller:$TAG
 crane cp --allow-nondistributable-artifacts ghcr.io/loft-sh/vcluster-oss:0.20.0 $IMAGE_REGISTRY/vcluster-oss:$TAG
+crane cp --allow-nondistributable-artifacts ghcr.io/voyagermesh/defaultbackend:1.5 $IMAGE_REGISTRY/defaultbackend:$TAG
 crane cp --allow-nondistributable-artifacts ghcr.io/voyagermesh/echoserver:v20221109 $IMAGE_REGISTRY/echoserver:$TAG
 crane cp --allow-nondistributable-artifacts ghcr.io/voyagermesh/envoy:v1.31.2-ac $IMAGE_REGISTRY/envoy:$TAG
 crane cp --allow-nondistributable-artifacts ghcr.io/voyagermesh/gateway-converter:v0.0.1 $IMAGE_REGISTRY/gateway-converter:$TAG
@@ -153,7 +154,6 @@ crane cp --allow-nondistributable-artifacts rabbitmq:3.12.1-management $IMAGE_RE
 crane cp --allow-nondistributable-artifacts rancher/kine:v0.11.4 $IMAGE_REGISTRY/kine:$TAG
 crane cp --allow-nondistributable-artifacts registry.k8s.io/autoscaling/cluster-autoscaler:v1.27.1 $IMAGE_REGISTRY/cluster-autoscaler:$TAG
 crane cp --allow-nondistributable-artifacts registry.k8s.io/csi-secrets-store/driver:v1.4.1 $IMAGE_REGISTRY/driver:$TAG
-crane cp --allow-nondistributable-artifacts registry.k8s.io/defaultbackend-amd64:1.5 $IMAGE_REGISTRY/ingress-nginx-defaultbackend:$TAG
 crane cp --allow-nondistributable-artifacts registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6 $IMAGE_REGISTRY/ingress-nginx-kube-webhook-certgen:$TAG
 crane cp --allow-nondistributable-artifacts registry.k8s.io/kube-apiserver:v1.30.2 $IMAGE_REGISTRY/kube-apiserver:$TAG
 crane cp --allow-nondistributable-artifacts registry.k8s.io/kube-controller-manager:v1.30.2 $IMAGE_REGISTRY/kube-controller-manager:$TAG

diff --git a/charts/ace/values.openapiv3_schema.yaml b/charts/ace/values.openapiv3_schema.yaml
@@ -6151,10 +6151,16 @@ properties:
             type: boolean
           image:
             properties:
+              image:
+                type: string
               registry:
                 type: string
+              tag:
+                type: string
             required:
+            - image
             - registry
+            - tag
             type: object
           name:
             type: string

diff --git a/schema/ingress-nginx/values.openapiv3_schema.yaml b/schema/ingress-nginx/values.openapiv3_schema.yaml
@@ -379,10 +379,16 @@ properties:
         type: boolean
       image:
         properties:
+          image:
+            type: string
           registry:
             type: string
+          tag:
+            type: string
         required:
+        - image
         - registry
+        - tag
         type: object
       name:
         type: string

diff --git a/tests/check-charts_test.go b/tests/check-charts_test.go
@@ -54,8 +54,6 @@ func Test_CheckImageArchitectures(t *testing.T) {
 		"ghcr.io/kluster-manager/registration-operator:v0.14.0",
 		"ghcr.io/kluster-manager/registration:v0.14.0",
 		"ghcr.io/kluster-manager/work:v0.14.0",
-		"ghcr.io/voyagermesh/envoy:v1.31.2-ac",
-		"registry.k8s.io/defaultbackend-amd64:1.5",
 	}); err != nil {
 		t.Errorf("CheckImageArchitectures() error = %v", err)
 	}