fix: Update API's to work for OpenShift 4.9

controllers/controller/devworkspacerouting/devworkspacerouting_controller.go

@@ -28,7 +28,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	routeV1 "github.com/openshift/api/route/v1"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/api/extensions/v1beta1"
+	networkingv1 "k8s.io/api/networking/v1"
 	k8sErrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -58,7 +58,7 @@ type DevWorkspaceRoutingReconciler struct {
 // +kubebuilder:rbac:groups=controller.devfile.io,resources=devworkspaceroutings,verbs=*
 // +kubebuilder:rbac:groups=controller.devfile.io,resources=devworkspaceroutings/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups="",resources=services,verbs=*
-// +kubebuilder:rbac:groups=extensions,resources=ingresses,verbs=*
+// +kubebuilder:rbac:groups=networking.k8s.io,resources=ingresses,verbs=*
 // +kubebuilder:rbac:groups=route.openshift.io,resources=routes,verbs=*
 // +kubebuidler:rbac:groups=route.openshift.io,resources=routes/status,verbs=get,list,watch
 // +kubebuilder:rbac:groups=route.openshift.io,resources=routes/custom-host,verbs=create
@@ -311,7 +311,7 @@ func (r *DevWorkspaceRoutingReconciler) SetupWithManager(mgr ctrl.Manager) error
 		WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles}).
 		For(&controllerv1alpha1.DevWorkspaceRouting{}).
 		Owns(&corev1.Service{}).
-		Owns(&v1beta1.Ingress{})
+		Owns(&networkingv1.Ingress{})
 	if infrastructure.IsOpenShift() {
 		bld.Owns(&routeV1.Route{})
 	}

controllers/controller/devworkspacerouting/solvers/common.go

@@ -21,7 +21,7 @@ import (
 
 	routeV1 "github.com/openshift/api/route/v1"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/api/extensions/v1beta1"
+	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
@@ -165,8 +165,8 @@ func getRoutesForSpec(routingSuffix string, endpoints map[string]controllerv1alp
 	return routes
 }
 
-func getIngressesForSpec(routingSuffix string, endpoints map[string]controllerv1alpha1.EndpointList, meta DevWorkspaceMetadata) []v1beta1.Ingress {
-	var ingresses []v1beta1.Ingress
+func getIngressesForSpec(routingSuffix string, endpoints map[string]controllerv1alpha1.EndpointList, meta DevWorkspaceMetadata) []networkingv1.Ingress {
+	var ingresses []networkingv1.Ingress
 	for _, machineEndpoints := range endpoints {
 		for _, endpoint := range machineEndpoints {
 			if endpoint.Exposure != dw.PublicEndpointExposure {
@@ -208,12 +208,11 @@ func getRouteForEndpoint(routingSuffix string, endpoint dw.Endpoint, meta DevWor
 	}
 }
 
-func getIngressForEndpoint(routingSuffix string, endpoint dw.Endpoint, meta DevWorkspaceMetadata) v1beta1.Ingress {
-	targetEndpoint := intstr.FromInt(endpoint.TargetPort)
+func getIngressForEndpoint(routingSuffix string, endpoint dw.Endpoint, meta DevWorkspaceMetadata) networkingv1.Ingress {
 	endpointName := common.EndpointName(endpoint.Name)
 	hostname := common.EndpointHostname(routingSuffix, meta.DevWorkspaceId, endpointName, endpoint.TargetPort)
-	ingressPathType := v1beta1.PathTypeImplementationSpecific
-	return v1beta1.Ingress{
+	ingressPathType := networkingv1.PathTypeImplementationSpecific
+	return networkingv1.Ingress{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      common.RouteName(meta.DevWorkspaceId, endpointName),
 			Namespace: meta.Namespace,
@@ -222,17 +221,19 @@ func getIngressForEndpoint(routingSuffix string, endpoint dw.Endpoint, meta DevW
 			},
 			Annotations: nginxIngressAnnotations(endpoint.Name),
 		},
-		Spec: v1beta1.IngressSpec{
-			Rules: []v1beta1.IngressRule{
+		Spec: networkingv1.IngressSpec{
+			Rules: []networkingv1.IngressRule{
 				{
 					Host: hostname,
-					IngressRuleValue: v1beta1.IngressRuleValue{
-						HTTP: &v1beta1.HTTPIngressRuleValue{
-							Paths: []v1beta1.HTTPIngressPath{
+					IngressRuleValue: networkingv1.IngressRuleValue{
+						HTTP: &networkingv1.HTTPIngressRuleValue{
+							Paths: []networkingv1.HTTPIngressPath{
 								{
-									Backend: v1beta1.IngressBackend{
-										ServiceName: common.ServiceName(meta.DevWorkspaceId),
-										ServicePort: targetEndpoint,
+									Backend: networkingv1.IngressBackend{
+										Service: &networkingv1.IngressServiceBackend{
+											Name: common.ServiceName(meta.DevWorkspaceId),
+											Port: networkingv1.ServiceBackendPort{Number: int32(endpoint.TargetPort)},
+										},
 									},
 									PathType: &ingressPathType,
 									Path:     "/",

controllers/controller/devworkspacerouting/solvers/solver.go

@@ -16,8 +16,8 @@ import (
 	"fmt"
 
 	routeV1 "github.com/openshift/api/route/v1"
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/api/extensions/v1beta1"
+	corev1 "k8s.io/api/core/v1"
+	networkingv1 "k8s.io/api/networking/v1"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -26,8 +26,8 @@ import (
 )
 
 type RoutingObjects struct {
-	Services     []v1.Service
-	Ingresses    []v1beta1.Ingress
+	Services     []corev1.Service
+	Ingresses    []networkingv1.Ingress
 	Routes       []routeV1.Route
 	PodAdditions *controllerv1alpha1.PodAdditions
 }

controllers/controller/devworkspacerouting/sync_ingresses.go

@@ -20,7 +20,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"k8s.io/api/extensions/v1beta1"
+	networkingv1 "k8s.io/api/networking/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -29,11 +29,11 @@ import (
 )
 
 var ingressDiffOpts = cmp.Options{
-	cmpopts.IgnoreFields(v1beta1.Ingress{}, "TypeMeta", "ObjectMeta", "Status"),
-	cmpopts.IgnoreFields(v1beta1.HTTPIngressPath{}, "PathType"),
+	cmpopts.IgnoreFields(networkingv1.Ingress{}, "TypeMeta", "ObjectMeta", "Status"),
+	cmpopts.IgnoreFields(networkingv1.HTTPIngressPath{}, "PathType"),
 }
 
-func (r *DevWorkspaceRoutingReconciler) syncIngresses(routing *controllerv1alpha1.DevWorkspaceRouting, specIngresses []v1beta1.Ingress) (ok bool, clusterIngresses []v1beta1.Ingress, err error) {
+func (r *DevWorkspaceRoutingReconciler) syncIngresses(routing *controllerv1alpha1.DevWorkspaceRouting, specIngresses []networkingv1.Ingress) (ok bool, clusterIngresses []networkingv1.Ingress, err error) {
 	ingressesInSync := true
 
 	clusterIngresses, err = r.getClusterIngresses(routing)
@@ -74,8 +74,8 @@ func (r *DevWorkspaceRoutingReconciler) syncIngresses(routing *controllerv1alpha
 	return ingressesInSync, clusterIngresses, nil
 }
 
-func (r *DevWorkspaceRoutingReconciler) getClusterIngresses(routing *controllerv1alpha1.DevWorkspaceRouting) ([]v1beta1.Ingress, error) {
-	found := &v1beta1.IngressList{}
+func (r *DevWorkspaceRoutingReconciler) getClusterIngresses(routing *controllerv1alpha1.DevWorkspaceRouting) ([]networkingv1.Ingress, error) {
+	found := &networkingv1.IngressList{}
 	labelSelector, err := labels.Parse(fmt.Sprintf("%s=%s", constants.DevWorkspaceIDLabel, routing.Spec.DevWorkspaceId))
 	if err != nil {
 		return nil, err
@@ -91,8 +91,8 @@ func (r *DevWorkspaceRoutingReconciler) getClusterIngresses(routing *controllerv
 	return found.Items, nil
 }
 
-func getIngressesToDelete(clusterIngresses, specIngresses []v1beta1.Ingress) []v1beta1.Ingress {
-	var toDelete []v1beta1.Ingress
+func getIngressesToDelete(clusterIngresses, specIngresses []networkingv1.Ingress) []networkingv1.Ingress {
+	var toDelete []networkingv1.Ingress
 	for _, clusterIngress := range clusterIngresses {
 		if contains, _ := listContainsIngressByName(clusterIngress, specIngresses); !contains {
 			toDelete = append(toDelete, clusterIngress)
@@ -101,7 +101,7 @@ func getIngressesToDelete(clusterIngresses, specIngresses []v1beta1.Ingress) []v
 	return toDelete
 }
 
-func listContainsIngressByName(query v1beta1.Ingress, list []v1beta1.Ingress) (exists bool, idx int) {
+func listContainsIngressByName(query networkingv1.Ingress, list []networkingv1.Ingress) (exists bool, idx int) {
 	for idx, listIngress := range list {
 		if query.Name == listIngress.Name {
 			return true, idx

deploy/templates/components/rbac/role.yaml

@@ -126,19 +126,19 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - extensions
-  resources:
-  - ingresses
-  verbs:
-  - '*'
 - apiGroups:
   - monitoring.coreos.com
   resources:
   - servicemonitors
   verbs:
   - create
   - get
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses
+  verbs:
+  - '*'
 - apiGroups:
   - oauth.openshift.io
   resources:

pkg/infrastructure/webhook.go

@@ -32,7 +32,7 @@ func IsWebhookConfigurationEnabled() (bool, error) {
 		return false, err
 	}
 
-	if admissionRegistrationResources := findAPIResources(apiResources, "admissionregistration.k8s.io/v1beta1"); admissionRegistrationResources != nil {
+	if admissionRegistrationResources := findAPIResources(apiResources, "admissionregistration.k8s.io/v1"); admissionRegistrationResources != nil {
 		isMutatingHookAvailable := false
 		isValidatingMutatingHookAvailable := false
 		for i := range admissionRegistrationResources {

pkg/webhook/info.go

@@ -16,18 +16,19 @@ import (
 	"context"
 	"fmt"
 
-	webhookCfg "github.com/devfile/devworkspace-operator/webhook/workspace"
-	"k8s.io/api/admissionregistration/v1beta1"
+	admregv1 "k8s.io/api/admissionregistration/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	webhookCfg "github.com/devfile/devworkspace-operator/webhook/workspace"
 )
 
 var webhooksCreationTimestamp = metav1.Time{}
 
 func GetWebhooksCreationTimestamp(client client.Client) (metav1.Time, error) {
 	if webhooksCreationTimestamp.IsZero() {
-		webhook := &v1beta1.MutatingWebhookConfiguration{}
+		webhook := &admregv1.MutatingWebhookConfiguration{}
 		err := client.Get(context.TODO(), types.NamespacedName{Name: webhookCfg.MutateWebhookCfgName}, webhook)
 		if err != nil {
 			return metav1.Time{}, fmt.Errorf("failed to get webhook: %w", err)