Use networking.k8s.io/v1 (#32)

Signed-off-by: clyang82 <chuyang@redhat.com>
stolostron · Aug 25, 2021 · b39cc0d · b39cc0d
1 parent 2c39a34
commit b39cc0d
Show file tree

Hide file tree

Showing 50 changed files with 673 additions and 861 deletions.
diff --git a/deploy/kubernetes/router.yaml b/deploy/kubernetes/router.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: DaemonSet
 metadata:
   name: management-ingress

diff --git a/examples/auth-ingress.yaml b/examples/auth-ingress.yaml
@@ -1,6 +1,6 @@
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: platform-login
@@ -22,7 +22,7 @@ spec:
 
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: platform-oidc
@@ -50,7 +50,7 @@ spec:
 
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: platform-auth
@@ -77,7 +77,7 @@ spec:
 
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: platform-id-provider
@@ -95,7 +95,7 @@ spec:
           servicePort: 4300
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: platform-id-auth
@@ -115,7 +115,7 @@ spec:
 
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: id-mgmt

diff --git a/examples/authz-ingress.yaml b/examples/authz-ingress.yaml
@@ -1,6 +1,6 @@
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: iam-token
@@ -17,7 +17,7 @@ spec:
           servicePort: 10443
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: iam-pap
@@ -35,7 +35,7 @@ spec:
 
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: iam-pdp

diff --git a/examples/catalog-ui-ingress.yaml b/examples/catalog-ui-ingress.yaml
@@ -1,6 +1,6 @@
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: catalog-ui
@@ -19,7 +19,7 @@ spec:
 
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: helm-api
@@ -38,7 +38,7 @@ spec:
 
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: helm-repo

diff --git a/examples/elastic-ingress.yaml b/examples/elastic-ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: elastic

diff --git a/examples/image-manager-ingress.yaml b/examples/image-manager-ingress.yaml
@@ -1,6 +1,6 @@
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: image-manager-auth
@@ -18,7 +18,7 @@ spec:
 
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: image-manager

diff --git a/examples/metering-ingress.yaml b/examples/metering-ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: metering-ui

diff --git a/examples/monitoring-ingress.yaml b/examples/monitoring-ingress.yaml
@@ -1,6 +1,6 @@
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: grafana
@@ -22,7 +22,7 @@ spec:
 
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: alertmanager
@@ -44,7 +44,7 @@ spec:
 
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: prometheus
@@ -75,7 +75,7 @@ spec:
 
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: prometheus-graph

diff --git a/examples/ui-ingress.yaml b/examples/ui-ingress.yaml
@@ -1,6 +1,6 @@
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: platform-ui
@@ -20,7 +20,7 @@ spec:
 
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: platform-ui-api
@@ -38,7 +38,7 @@ spec:
 
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: platform-ui-callback

diff --git a/examples/unified-router-ingress.yaml b/examples/unified-router-ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: unified-router

diff --git a/go.mod b/go.mod
@@ -3,58 +3,20 @@ module github.com/open-cluster-management/management-ingress
 go 1.16
 
 require (
-	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
-	github.com/elazarl/goproxy v0.0.0-20200426045556-49ad98f6dac1 // indirect
-	github.com/evanphx/json-patch v4.5.0+incompatible // indirect
 	github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
-	github.com/golang/mock v1.4.3 // indirect
-	github.com/googleapis/gnostic v0.3.1 // indirect
 	github.com/imdario/mergo v0.3.9
 	github.com/kylelemons/godebug v1.1.0
 	github.com/mitchellh/go-ps v1.0.0
 	github.com/mitchellh/mapstructure v1.3.2
 	github.com/ncabatoff/process-exporter v0.7.1
-	github.com/onsi/ginkgo v1.13.0 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.7.1 // indirect
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.6.1 // indirect
 	github.com/zakjan/cert-chain-resolver v0.0.0-20200409100953-fa92b0b5236f
-	golang.org/x/text v0.3.5 // indirect
 	gopkg.in/fsnotify.v1 v1.4.7
-	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
 	gopkg.in/go-playground/pool.v3 v3.1.1
-	k8s.io/api v0.18.5
-	k8s.io/apimachinery v0.18.5
-	k8s.io/client-go v0.18.5
+	k8s.io/api v0.21.3
+	k8s.io/apimachinery v0.21.3
+	k8s.io/client-go v0.21.3
 	k8s.io/klog v1.0.0
-	k8s.io/kubernetes v1.18.8
-)
-
-replace (
-	github.com/coreos/etcd => go.etcd.io/etcd v3.3.22+incompatible
-	github.com/gorilla/websocket => github.com/gorilla/websocket v1.4.2
-	k8s.io/api => k8s.io/api v0.18.5
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.5
-	k8s.io/apimachinery => k8s.io/apimachinery v0.18.5
-	k8s.io/apiserver => k8s.io/apiserver v0.18.5
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.5
-	k8s.io/client-go => k8s.io/client-go v0.18.5
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.5
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.5
-	k8s.io/code-generator => k8s.io/code-generator v0.18.5
-	k8s.io/component-base => k8s.io/component-base v0.18.5
-	k8s.io/cri-api => k8s.io/cri-api v0.18.5
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.5
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.5
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.5
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.5
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.5
-	k8s.io/kubectl => k8s.io/kubectl v0.18.5
-	k8s.io/kubelet => k8s.io/kubelet v0.18.5
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.5
-	k8s.io/metrics => k8s.io/metrics v0.18.5
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.5
 )