chore: remove ingress (#3623)

Co-authored-by: Rémy Léone <rleone@scaleway.com>
scaleway · Jan 29, 2024 · 0da87db · 0da87db
1 parent ad00044
commit 0da87db
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 43 deletions.
diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/moby/buildkit v0.11.6
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/pkg/errors v0.9.1
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.22.0.20240125141820-0e00141f1e3a
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.22.0.20240125143158-b2e6d7321c8d
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5

diff --git a/go.sum b/go.sum
@@ -392,8 +392,8 @@ github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDN
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.22.0.20240125141820-0e00141f1e3a h1:rOSA+pK9sr0Pu7whtaO7slAdQF1lZonwRBsCLoSq8jQ=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.22.0.20240125141820-0e00141f1e3a/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.22.0.20240125143158-b2e6d7321c8d h1:ReVgU/olxRKhofTFmXR1qKbj111p+DgqUpdGlrJ2wME=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.22.0.20240125143158-b2e6d7321c8d/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
 github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
 github.com/secure-systems-lab/go-securesystemslib v0.4.0 h1:b23VGrQhTA8cN2CbBw7/FulN9fTtqYUdS5+Oxzt+DUE=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=

diff --git a/internal/namespaces/k8s/v1/custom_version.go b/internal/namespaces/k8s/v1/custom_version.go
@@ -39,10 +39,6 @@ func versionMarshalerFunc(i interface{}, opt *human.MarshalOpt) (string, error)
 			FieldName: "AvailableCnis",
 			Title:     "Available CNIs",
 		},
-		{
-			FieldName: "AvailableIngresses",
-			Title:     "Available Ingresses",
-		},
 		{
 			FieldName: "AvailableContainerRuntimes",
 			Title:     "Available Container Runtimes",

diff --git a/internal/namespaces/k8s/v1/testdata/test-get-cluster-simple.golden b/internal/namespaces/k8s/v1/testdata/test-get-cluster-simple.golden
@@ -14,8 +14,6 @@ ClusterURL        https://e96a93a2-c36f-42bb-b7e1-bebf52db7956.api.k8s.fr-par.sc
 DNSWildcard       *.e96a93a2-c36f-42bb-b7e1-bebf52db7956.nodes.k8s.fr-par.scw.cloud
 CreatedAt         few seconds ago
 UpdatedAt         few seconds ago
-DashboardEnabled  false
-Ingress           none
 UpgradeAvailable  true
 PrivateNetworkID  ac61c2ff-059a-4ce9-ab43-c8c70c85aef6
 CommitmentEndsAt  few seconds ago
@@ -76,8 +74,6 @@ ID                                    NAME     STATUS   VERSION  NODE TYPE  MIN
     "scale_down_utilization_threshold": 0.5,
     "max_graceful_termination_sec": 600
   },
-  "dashboard_enabled": false,
-  "ingress": "none",
   "auto_upgrade": {
     "enabled": false,
     "maintenance_window": {

diff --git a/internal/namespaces/k8s/v1/testdata/test-get-version-simple.golden b/internal/namespaces/k8s/v1/testdata/test-get-version-simple.golden
@@ -10,9 +10,6 @@ map[containerLogMaxFiles:uint16 containerLogMaxSize:quantity cpuCFSQuota:bool cp
 Available CNIs:
 [cilium calico kilo]
 
-Available Ingresses:
-[none]
-
 Available Container Runtimes:
 [containerd]
 
@@ -31,9 +28,6 @@ Available Admission Plugins:
     "calico",
     "kilo"
   ],
-  "available_ingresses": [
-    "none"
-  ],
   "available_container_runtimes": [
     "containerd"
   ],

diff --git a/internal/namespaces/k8s/v1/testdata/test-list-version-basic-simple.golden b/internal/namespaces/k8s/v1/testdata/test-list-version-basic-simple.golden
@@ -18,9 +18,6 @@ NAME     AVAILABLE CNIS                      AVAILABLE CONTAINER RUNTIMES  AVAIL
       "calico",
       "kilo"
     ],
-    "available_ingresses": [
-      "none"
-    ],
     "available_container_runtimes": [
       "containerd"
     ],
@@ -55,9 +52,6 @@ NAME     AVAILABLE CNIS                      AVAILABLE CONTAINER RUNTIMES  AVAIL
       "calico",
       "kilo"
     ],
-    "available_ingresses": [
-      "none"
-    ],
     "available_container_runtimes": [
       "containerd"
     ],
@@ -92,9 +86,6 @@ NAME     AVAILABLE CNIS                      AVAILABLE CONTAINER RUNTIMES  AVAIL
       "calico",
       "kilo"
     ],
-    "available_ingresses": [
-      "none"
-    ],
     "available_container_runtimes": [
       "containerd"
     ],
@@ -132,9 +123,6 @@ NAME     AVAILABLE CNIS                      AVAILABLE CONTAINER RUNTIMES  AVAIL
       "flannel",
       "kilo"
     ],
-    "available_ingresses": [
-      "none"
-    ],
     "available_container_runtimes": [
       "containerd",
       "crio"
@@ -175,11 +163,6 @@ NAME     AVAILABLE CNIS                      AVAILABLE CONTAINER RUNTIMES  AVAIL
       "flannel",
       "kilo"
     ],
-    "available_ingresses": [
-      "none",
-      "nginx",
-      "traefik2"
-    ],
     "available_container_runtimes": [
       "containerd",
       "crio",
@@ -220,11 +203,6 @@ NAME     AVAILABLE CNIS                      AVAILABLE CONTAINER RUNTIMES  AVAIL
       "flannel",
       "kilo"
     ],
-    "available_ingresses": [
-      "none",
-      "nginx",
-      "traefik2"
-    ],
     "available_container_runtimes": [
       "containerd",
       "crio",

diff --git a/internal/namespaces/k8s/v1/testdata/test-wait-cluster-wait-for-pools.golden b/internal/namespaces/k8s/v1/testdata/test-wait-cluster-wait-for-pools.golden
@@ -14,8 +14,6 @@ ClusterURL        https://37176254-0637-41bd-b519-091d431d29ed.api.k8s.fr-par.sc
 DNSWildcard       *.37176254-0637-41bd-b519-091d431d29ed.nodes.k8s.fr-par.scw.cloud
 CreatedAt         few seconds ago
 UpdatedAt         few seconds ago
-DashboardEnabled  false
-Ingress           none
 UpgradeAvailable  true
 PrivateNetworkID  65834a6d-2e7c-43f1-bd71-52fa7307ab07
 CommitmentEndsAt  few seconds ago
@@ -72,8 +70,6 @@ GroupsPrefix    -
     "scale_down_utilization_threshold": 0.5,
     "max_graceful_termination_sec": 600
   },
-  "dashboard_enabled": false,
-  "ingress": "none",
   "auto_upgrade": {
     "enabled": false,
     "maintenance_window": {