Skip to content
Snippets Groups Projects
Commit cf2e2a97 authored by Manuel Kieweg's avatar Manuel Kieweg
Browse files

upgrade networking api to v1

parent 0ad30932
Branches
No related tags found
1 merge request!159Resolve "Integration Tests Fail"
Pipeline #73692 failed
......@@ -8,7 +8,7 @@ import (
log "github.com/sirupsen/logrus"
appv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
netv1 "k8s.io/api/networking/v1beta1"
netv1 "k8s.io/api/networking/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
......@@ -86,7 +86,7 @@ func create(clientset *kubernetes.Clientset, tag string) error {
} else {
log.Printf("service %v created", service.Name)
}
_, err = clientset.NetworkingV1beta1().Ingresses("cocsn").Create(ctx, ingress, opts)
_, err = clientset.NetworkingV1().Ingresses("cocsn").Create(ctx, ingress, opts)
if err != nil {
switch err.(type) {
case *errors.StatusError:
......@@ -159,12 +159,12 @@ func update(clientset *kubernetes.Clientset, resource metav1.Common, env string)
log.Printf("service %v updated", service.Name)
case *netv1.Ingress:
ingress := resource
i, err := clientset.NetworkingV1beta1().Ingresses("cocsn").Get(ctx, env, getOpts)
i, err := clientset.NetworkingV1().Ingresses("cocsn").Get(ctx, env, getOpts)
if err != nil {
return err
}
i.DeepCopyInto(ingress)
_, err = clientset.NetworkingV1beta1().Ingresses("cocsn").Update(ctx, ingress, opts)
_, err = clientset.NetworkingV1().Ingresses("cocsn").Update(ctx, ingress, opts)
if err != nil {
return err
}
......@@ -370,9 +370,13 @@ func createIngress(env string) *netv1.Ingress {
APIVersion: "v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: env,
Namespace: "cocsn",
Annotations: map[string]string{"nginx.ingress.kubernetes.io/backend-protocol": "GRPC"},
Name: env,
Namespace: "cocsn",
Annotations: map[string]string{
"nginx.ingress.kubernetes.io/backend-protocol": "GRPC",
"kubernetes.io/ingress.class": "nginx",
"nginx.ingress.kubernetes.io/ssl-redirect": "true",
},
},
Spec: netv1.IngressSpec{
Rules: []netv1.IngressRule{
......@@ -383,8 +387,10 @@ func createIngress(env string) *netv1.Ingress {
Paths: []netv1.HTTPIngressPath{
{
Backend: netv1.IngressBackend{
ServiceName: env,
ServicePort: intstr.IntOrString{IntVal: 55055},
Service: &netv1.IngressServiceBackend{
Name: env,
Port: netv1.ServiceBackendPort{Number: 55055},
},
},
},
},
......
......@@ -6,8 +6,8 @@ require (
code.fbi.h-da.de/cocsn/api/go v0.0.0-20210528163424-f37e91dc5895
code.fbi.h-da.de/cocsn/yang-models v0.0.7
github.com/aristanetworks/goarista v0.0.0-20201120222254-94a892eb0c6a
github.com/golang/protobuf v1.5.2
github.com/docker/docker v1.13.1
github.com/golang/protobuf v1.5.2
github.com/google/gnxi v0.0.0-20201221102247-c26672548161
github.com/google/uuid v1.1.2
github.com/neo4j/neo4j-go-driver v1.8.3
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment