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

change service type to load balancer

parent 1bd2ae49
No related branches found
No related tags found
1 merge request!159Resolve "Integration Tests Fail"
Pipeline #73927 passed
...@@ -70,7 +70,6 @@ func main() { ...@@ -70,7 +70,6 @@ func main() {
func create(clientset *kubernetes.Clientset, tag string) error { func create(clientset *kubernetes.Clientset, tag string) error {
env := "gosdn-" + tag env := "gosdn-" + tag
service := createService(env) service := createService(env)
ingress := createIngress(env)
config := createConfigMap(env) config := createConfigMap(env)
deployment := createDeployment(env, tag) deployment := createDeployment(env, tag)
opts := metav1.CreateOptions{} opts := metav1.CreateOptions{}
...@@ -92,23 +91,6 @@ func create(clientset *kubernetes.Clientset, tag string) error { ...@@ -92,23 +91,6 @@ func create(clientset *kubernetes.Clientset, tag string) error {
} else { } else {
log.Printf("service %v created", service.Name) log.Printf("service %v created", service.Name)
} }
_, err = clientset.NetworkingV1().Ingresses("cocsn").Create(ctx, ingress, opts)
if err != nil {
switch err.(type) {
case *errors.StatusError:
if err.(*errors.StatusError).ErrStatus.Code == 409 {
if err := update(clientset, ingress, env); err != nil {
log.Error(err)
}
} else {
log.Error(err)
}
default:
log.Error(err)
}
} else {
log.Printf("ingress %v created", ingress.Name)
}
_, err = clientset.CoreV1().ConfigMaps("cocsn").Create(ctx, config, opts) _, err = clientset.CoreV1().ConfigMaps("cocsn").Create(ctx, config, opts)
if err != nil { if err != nil {
switch err.(type) { switch err.(type) {
...@@ -246,6 +228,9 @@ func createService(environment string) *corev1.Service { ...@@ -246,6 +228,9 @@ func createService(environment string) *corev1.Service {
Name: environment, Name: environment,
Namespace: "cocsn", Namespace: "cocsn",
Labels: map[string]string{"run": environment}, Labels: map[string]string{"run": environment},
Annotations: map[string]string{
"metallb.universe.tf/address-pool": "hdanet",
},
}, },
Spec: corev1.ServiceSpec{ Spec: corev1.ServiceSpec{
Ports: []corev1.ServicePort{ Ports: []corev1.ServicePort{
...@@ -260,9 +245,8 @@ func createService(environment string) *corev1.Service { ...@@ -260,9 +245,8 @@ func createService(environment string) *corev1.Service {
TargetPort: intstr.IntOrString{IntVal: GRPC}, TargetPort: intstr.IntOrString{IntVal: GRPC},
}, },
}, },
Selector: map[string]string{"run": environment}, Selector: map[string]string{"run": environment},
Type: "NodePort", Type: "Loadbalncer",
ExternalName: environment + ".apps.ocp.fbi.h-da.de",
}, },
} }
} }
...@@ -368,44 +352,3 @@ func createConfigMap(env string) *corev1.ConfigMap { ...@@ -368,44 +352,3 @@ func createConfigMap(env string) *corev1.ConfigMap {
Data: map[string]string{"gosdn.toml": "#empty"}, Data: map[string]string{"gosdn.toml": "#empty"},
} }
} }
func createIngress(env string) *netv1.Ingress {
pathType := netv1.PathTypeImplementationSpecific
return &netv1.Ingress{
TypeMeta: metav1.TypeMeta{
Kind: "Ingress",
APIVersion: "v1",
},
ObjectMeta: metav1.ObjectMeta{
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{
{
Host: env + ".apps.ocp.fbi.h-da.de",
IngressRuleValue: netv1.IngressRuleValue{
HTTP: &netv1.HTTPIngressRuleValue{
Paths: []netv1.HTTPIngressPath{
{
PathType: &pathType,
Backend: netv1.IngressBackend{
Service: &netv1.IngressServiceBackend{
Name: env,
Port: netv1.ServiceBackendPort{Name: "grpc"},
},
},
},
},
},
},
},
},
},
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment