upd app-proxy manifest for k8s 1.22+ (#269)

* upd app-proxy manifest for k8s 1.22+

* add ingressClassName field

Author: mikhail-klimko

charts/cf-runtime/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: cf-runtime
 description: A Helm chart for Codefresh Runner
 type: application
-version: 0.1.8
-appVersion: "0.1.8"
+version: 0.1.9
+appVersion: "0.1.9"

charts/cf-runtime/templates/app-proxy/ingress.app-proxy.yaml

@@ -1,23 +1,28 @@
 {{ if .Values.appProxy.enabled }}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "cf-app-proxy.fullname" . }}
   labels: {{- include "cf-app-proxy.labels" . | nindent 4 }}
   annotations:
-    {{ if .Values.appProxy.ingress.class }}kubernetes.io/ingress.class: {{ .Values.appProxy.ingress.class }}{{ end }}
     {{ range $key, $value := .Values.appProxy.ingress.annotations }}
     {{ $key }}: {{ $value | quote }}
     {{ end }}
 spec:
+  {{ if .Values.appProxy.ingress.class }}
+  ingressClassName: {{ .Values.appProxy.ingress.class }}
+  {{ end }}
   rules:
     - host: {{ .Values.appProxy.ingress.host }}
       http:
         paths:
           - path: {{ if .Values.appProxy.ingress.pathPrefix }}{{ .Values.appProxy.ingress.pathPrefix }}{{ else }}'/'{{end}}
+            pathType: ImplementationSpecific
             backend:
-              serviceName: {{ include "cf-app-proxy.fullname" . }}
-              servicePort: 80
+              service:
+                name: app-proxy
+                port:
+                  number: 80
   {{ if .Values.appProxy.ingress.tlsSecret }}
   tls:
     - hosts:

venona/VERSION

@@ -1 +1 @@
-1.7.1
+1.7.2

venonactl/VERSION

@@ -1 +1 @@
-1.7.1
+1.7.2

venonactl/pkg/obj/kubeobj/kubeobj.go

@@ -45,7 +45,7 @@ var functionsMap map[string]string = map[string]string{
 	"v1beta1.Deployment": "ExtensionsV1beta1().Deployments(namespace)",
 	"v1beta1.DaemonSet":  "ExtensionsV1beta1().DaemonSets(namespace)",
 
-	"netV1beta1.Ingress": "NetworkingV1beta1().Ingresses(namespace)",
+	"netv1.Ingress": "NetworkingV1().Ingresses(namespace)",
 
 	"appsv1.Deployment": "AppsV1().Deployments(namespace)",
 	"appsv1.DaemonSet":  "AppsV1().DaemonSets(namespace)",
@@ -81,7 +81,7 @@ import (
     metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
     "k8s.io/api/core/v1"
 	v1beta1 "k8s.io/api/extensions/v1beta1"
-	netV1beta1 "k8s.io/api/networking/v1beta1"
+	netv1 "k8s.io/api/networking/v1"
     appsv1 "k8s.io/api/apps/v1"
 
     rbacv1beta1 "k8s.io/api/rbac/v1beta1"

venonactl/pkg/obj/kubeobj_generator.go

@@ -1,22 +1,27 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
-    {{ if ne .AppProxy.Ingress.IngressClass "" }}kubernetes.io/ingress.class: {{ .AppProxy.Ingress.IngressClass }}{{ end }}
     {{ range $key, $value := .AppProxy.Ingress.Annotations }}
     {{ $key }}: {{ $value | quote | unescape }}
     {{ end }}
   name: app-proxy
   namespace: {{ .Namespace }}
 spec:
+  {{ if ne .AppProxy.Ingress.IngressClass "" }}
+  ingressClassName: {{ .AppProxy.Ingress.IngressClass }}
+  {{ end }}
   rules:
     - host: {{ .AppProxy.Ingress.Host }}
       http:
         paths:
           - path: {{ if .AppProxy.Ingress.PathPrefix }}{{ .AppProxy.Ingress.PathPrefix }}{{ else }}'/'{{end}}
+            pathType: ImplementationSpecific
             backend:
-              serviceName: app-proxy
-              servicePort: 80
+              service:
+                name: app-proxy
+                port:
+                  number: 80
   {{ if .AppProxy.Ingress.TLSSecret }}
   tls:
     - hosts: