From 6d7edc7d8afe1397b877cb18371304e581538be7 Mon Sep 17 00:00:00 2001 From: Ritu Sood Date: Thu, 12 Sep 2019 06:09:51 -0700 Subject: Remove unused ovn-kubernetes Removing unsused ovn-kubernetes playbook and test from KUD. Currently there is no plan to use and also this is untested. Issue-ID: MULTICLOUD-684 Signed-off-by: Ritu Sood Change-Id: I684bf82c7d4ab6d051178a027a385923ec9c4f2b --- .../playbooks/configure-ovn-kubernetes.yml | 136 --------------------- kud/tests/ovn-kubernetes.sh | 136 --------------------- 2 files changed, 272 deletions(-) delete mode 100644 kud/deployment_infra/playbooks/configure-ovn-kubernetes.yml delete mode 100755 kud/tests/ovn-kubernetes.sh diff --git a/kud/deployment_infra/playbooks/configure-ovn-kubernetes.yml b/kud/deployment_infra/playbooks/configure-ovn-kubernetes.yml deleted file mode 100644 index 5f1c9f64..00000000 --- a/kud/deployment_infra/playbooks/configure-ovn-kubernetes.yml +++ /dev/null @@ -1,136 +0,0 @@ ---- -# SPDX-license-identifier: Apache-2.0 -############################################################################## -# Copyright (c) 2018 -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -- import_playbook: configure-ovn.yml - -- hosts: ovn-central:ovn-controller - vars: - central_node_ip: "{{ hostvars[groups['ovn-central'][0]]['ansible_ssh_host'] }}" - environment: - PATH: "{{ ansible_env.PATH }}:/usr/local/go/bin/" - pre_tasks: - - name: Load kud variables - include_vars: - file: kud-vars.yml - roles: - - role: andrewrothstein.go - go_ver: "{{ go_version }}" - tasks: - - name: Load kud variables - include_vars: - file: kud-vars.yml - - name: clone ovn-kubernetes repo - git: - repo: "{{ ovn_kubernetes_url }}" - dest: "{{ ovn_kubernetes_dest }}" - version: "{{ ovn_kubernetes_version }}" - force: yes - when: ovn_kubernetes_source_type == "source" - - name: getting binaries - block: - - name: download ovn-kubernetes tarball - get_url: - url: "{{ ovn_kubernetes_url }}" - dest: /tmp/ovn-kubernetes.tar.gz - - name: extract ovn-kubernetes source code - unarchive: - src: /tmp/ovn-kubernetes.tar.gz - dest: /tmp/ - remote_src: yes - - name: rename extracted folder - command: "mv /tmp/ovn-kubernetes-{{ ovn_kubernetes_version }}/ {{ ovn_kubernetes_dest }}/" - when: ovn_kubernetes_source_type == "tarball" - - name: make ovnkube files - make: - chdir: "{{ ovn_kubernetes_dest }}/go-controller" - - name: install ovnkube files - make: - chdir: "{{ ovn_kubernetes_dest }}/go-controller" - target: install - become: yes - - name: create OVN Kubernetes config file - become: yes - blockinfile: - path: /etc/openvswitch/ovn_k8s.conf - create: yes - block: | - [logging] - loglevel=5 - logfile=/var/log/openvswitch/ovnkube.log - - [cni] - conf-dir=/etc/cni/net.d - plugin=ovn-k8s-cni-overlay - - name: create ovnkube logging directory - file: - path: /var/log/openvswitch - state: directory - -- hosts: ovn-central - become: yes - vars: - central_node_ip: "{{ hostvars[groups['ovn-central'][0]]['ansible_ssh_host'] }}" - tasks: - - name: create ovnkube central systemd service - blockinfile: - path: /etc/systemd/system/ovn-k8s-central.service - create: yes - block: | - [Unit] - Description=OVN Central Daemon - - [Service] - ExecStart=/usr/bin/ovnkube \ - -net-controller \ - -init-master="{{ ansible_hostname }}" \ - -init-node="{{ ansible_hostname }}" \ - -nodeport \ - -k8s-kubeconfig=/etc/kubernetes/admin.conf \ - -k8s-token="test" \ - -nb-address="tcp://{{ central_node_ip }}:6641" \ - -sb-address="tcp://{{ central_node_ip }}:6642" - - [Install] - WantedBy=multi-user.target - - name: start ovnkube central systemd service - service: - name: ovn-k8s-central - state: started - enabled: yes - -- hosts: ovn-controller - become: yes - vars: - central_node_ip: "{{ hostvars[groups['ovn-central'][0]]['ansible_ssh_host'] }}" - tasks: - - name: create ovnkube controller systemd service - blockinfile: - path: /etc/systemd/system/ovn-k8s-host.service - create: yes - block: | - [Unit] - Description=OVN Controller Daemon - - [Service] - ExecStart=/usr/bin/ovnkube \ - -init-gateways \ - -init-node="{{ ansible_hostname }}" \ - -nodeport \ - -k8s-kubeconfig=/etc/kubernetes/admin.conf \ - -k8s-token="test" \ - -nb-address="tcp://{{ central_node_ip }}:6641" \ - -sb-address="tcp://{{ central_node_ip }}:6642" - - [Install] - WantedBy=multi-user.target - - name: start ovnkube controller systemd service - service: - name: ovn-k8s-host - state: started - enabled: yes diff --git a/kud/tests/ovn-kubernetes.sh b/kud/tests/ovn-kubernetes.sh deleted file mode 100755 index 95d216bf..00000000 --- a/kud/tests/ovn-kubernetes.sh +++ /dev/null @@ -1,136 +0,0 @@ -#!/bin/bash -# SPDX-license-identifier: Apache-2.0 -############################################################################## -# Copyright (c) 2018 -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -set -o errexit -set -o nounset -set -o pipefail - -apache_pod_name=apachetwin -nginx_pod_name=nginxtwin - -cat << APACHEPOD > $HOME/apache-pod.yaml -apiVersion: v1 -kind: Pod -metadata: - name: $apache_pod_name - labels: - name: webserver -spec: - containers: - - name: apachetwin - image: "busybox" - command: ["top"] - stdin: true - tty: true -APACHEPOD - -cat << NGINXPOD > $HOME/nginx-pod.yaml -apiVersion: v1 -kind: Pod -metadata: - name: $nginx_pod_name - labels: - name: webserver -spec: - containers: - - name: nginxtwin - image: "busybox" - command: ["top"] - stdin: true - tty: true -NGINXPOD - -cat << APACHEEW > $HOME/apache-e-w.yaml -apiVersion: v1 -kind: Service -metadata: - labels: - name: apacheservice - role: service - name: apacheservice -spec: - ports: - - port: 8800 - targetPort: 80 - protocol: TCP - name: tcp - selector: - name: webserver -APACHEEW - -cat << APACHENS > $HOME/apache-n-s.yaml -apiVersion: v1 -kind: Service -metadata: - labels: - name: apacheexternal - role: service - name: apacheexternal -spec: - ports: - - port: 8800 - targetPort: 80 - protocol: TCP - name: tcp - selector: - name: webserver - type: NodePort -APACHENS - -if $(kubectl version &>/dev/null); then - kubectl apply -f $HOME/apache-e-w.yaml - kubectl apply -f $HOME/apache-n-s.yaml - - kubectl delete pod $apache_pod_name --ignore-not-found=true --now - kubectl delete pod $nginx_pod_name --ignore-not-found=true --now - while kubectl get pod $apache_pod_name &>/dev/null; do - sleep 5 - done - while kubectl get pod $nginx_pod_name &>/dev/null; do - sleep 5 - done - kubectl create -f $HOME/apache-pod.yaml - kubectl create -f $HOME/nginx-pod.yaml - - status_phase="" - while [[ $status_phase != "Running" ]]; do - new_phase=$(kubectl get pods $apache_pod_name | awk 'NR==2{print $3}') - if [[ $new_phase != $status_phase ]]; then - echo "$(date +%H:%M:%S) - $new_phase" - status_phase=$new_phase - fi - if [[ $new_phase == "Err"* ]]; then - exit 1 - fi - done - status_phase="" - while [[ $status_phase != "Running" ]]; do - new_phase=$(kubectl get pods $nginx_pod_name | awk 'NR==2{print $3}') - if [[ $new_phase != $status_phase ]]; then - echo "$(date +%H:%M:%S) - $new_phase" - status_phase=$new_phase - fi - if [[ $new_phase == "Err"* ]]; then - exit 1 - fi - done - apache_ovn=$(kubectl get pod $apache_pod_name -o jsonpath="{.metadata.annotations.ovn}") - nginx_ovn=$(kubectl get pod $nginx_pod_name -o jsonpath="{.metadata.annotations.ovn}") - - echo $apache_ovn - if [[ $apache_ovn != *"\"ip_address\":\"11.11."* ]]; then - exit 1 - fi - - echo $nginx_ovn - if [[ $nginx_ovn != *"\"ip_address\":\"11.11."* ]]; then - exit 1 - fi -fi -- cgit 1.2.3-korg