diff --git a/build/cd/deploy.go b/build/cd/deploy.go index b4bdb8115ed43522c03d3c893c011fcacceb8b09..094be0a2ada6cea114ec4bb56fef67c2c3e66583 100644 --- a/build/cd/deploy.go +++ b/build/cd/deploy.go @@ -70,7 +70,6 @@ func main() { func create(clientset *kubernetes.Clientset, tag string) error { env := "gosdn-" + tag service := createService(env) - ingress := createIngress(env) config := createConfigMap(env) deployment := createDeployment(env, tag) opts := metav1.CreateOptions{} @@ -92,23 +91,6 @@ func create(clientset *kubernetes.Clientset, tag string) error { } else { 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) if err != nil { switch err.(type) { @@ -246,6 +228,9 @@ func createService(environment string) *corev1.Service { Name: environment, Namespace: "cocsn", Labels: map[string]string{"run": environment}, + Annotations: map[string]string{ + "metallb.universe.tf/address-pool": "hdanet", + }, }, Spec: corev1.ServiceSpec{ Ports: []corev1.ServicePort{ @@ -260,9 +245,8 @@ func createService(environment string) *corev1.Service { TargetPort: intstr.IntOrString{IntVal: GRPC}, }, }, - Selector: map[string]string{"run": environment}, - Type: "NodePort", - ExternalName: environment + ".apps.ocp.fbi.h-da.de", + Selector: map[string]string{"run": environment}, + Type: "Loadbalncer", }, } } @@ -368,44 +352,3 @@ func createConfigMap(env string) *corev1.ConfigMap { 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"}, - }, - }, - }, - }, - }, - }, - }, - }, - }, - } -}