diff options
Diffstat (limited to 'kud')
10 files changed, 64 insertions, 55 deletions
diff --git a/kud/deployment_infra/playbooks/configure-virtlet.yml b/kud/deployment_infra/playbooks/configure-virtlet.yml index 18d3740a..d2461f73 100644 --- a/kud/deployment_infra/playbooks/configure-virtlet.yml +++ b/kud/deployment_infra/playbooks/configure-virtlet.yml @@ -40,7 +40,7 @@ - regexp: 'centos/(\d+)-(\d+)' url: 'https://cloud.centos.org/centos/$1/images/CentOS-$1-x86_64-GenericCloud-$2.qcow2' - name: fedora - url: https://dl.fedoraproject.org/pub/fedora/linux/releases/29/Cloud/x86_64/images/Fedora-Cloud-Base-29-1.2.x86_64.qcow2 + url: https://dl.fedoraproject.org/pub/fedora/linux/releases/31/Cloud/x86_64/images/Fedora-Cloud-Base-31-1.9.x86_64.qcow2 {% if lookup('env','http_proxy') != "" %} transports: "": @@ -207,11 +207,13 @@ chdir: "{{ criproxy_dest }}" when: criproxy_source_type == "source" - name: download CRIproxy package + become: yes get_url: url: "{{ criproxy_url }}" dest: "{{ criproxy_dest }}/criproxy" when: criproxy_source_type == "binary" - name: set criproxy execution permissions + become: yes file: path: "{{ criproxy_dest }}/criproxy" mode: "+x" diff --git a/kud/deployment_infra/playbooks/kud-vars.yml b/kud/deployment_infra/playbooks/kud-vars.yml index a592a909..0fdfafeb 100644 --- a/kud/deployment_infra/playbooks/kud-vars.yml +++ b/kud/deployment_infra/playbooks/kud-vars.yml @@ -18,10 +18,11 @@ ovn_kubernetes_url: "https://github.com/openvswitch/ovn-kubernetes/archive/v{{ o #ovn_kubernetes_version: 456a0857956988f968bb08644c650ba826592ec1 #ovn_kubernetes_url: "https://github.com/openvswitch/ovn-kubernetes" -criproxy_dest: "{{ base_dest }}/criproxy" +criproxy_dest: "/usr/local/bin" criproxy_source_type: "binary" criproxy_version: 0.14.0 criproxy_url: "https://github.com/Mirantis/criproxy/releases/download/v{{ criproxy_version }}/criproxy" +#criproxy_dest: "{{ base_dest }}/criproxy" #criproxy_source_type: "source" #criproxy_version: b5ca5a6cec278e2054dface4f7a3e111fb9ab84b #criproxy_url: "https://github.com/Mirantis/criproxy" diff --git a/kud/hosting_providers/vagrant/Vagrantfile b/kud/hosting_providers/vagrant/Vagrantfile index 2d1b5ab4..eb5e5cdc 100644 --- a/kud/hosting_providers/vagrant/Vagrantfile +++ b/kud/hosting_providers/vagrant/Vagrantfile @@ -10,8 +10,8 @@ ############################################################################## box = { - :virtualbox => { :name => 'elastic/ubuntu-16.04-x86_64', :version => '20180708.0.0' }, - :libvirt => { :name => 'elastic/ubuntu-16.04-x86_64', :version=> '20180210.0.0'} + :virtualbox => { :name => 'elastic/ubuntu-18.04-x86_64', :version => '20191013.0.0'}, + :libvirt => { :name => 'intergratedcloudnative/ubuntu1804', :version => '1.0.0'} } require 'yaml' @@ -122,8 +122,8 @@ Vagrant.configure("2") do |config| installer.vm.provision 'shell', privileged: false do |sh| sh.env = {'KUD_PLUGIN_ENABLED': 'false', 'OVN_CENTRAL_INTERFACE': 'eth1'} sh.inline = <<-SHELL - cp /vagrant/insecure_keys/key.pub /home/vagrant/.ssh/id_rsa.pub - cp /vagrant/insecure_keys/key /home/vagrant/.ssh/id_rsa + cp /home/vagrant/multicloud-k8s/kud/hosting_providers/vagrant/insecure_keys/key.pub /home/vagrant/.ssh/id_rsa.pub + cp /home/vagrant/multicloud-k8s/kud/hosting_providers/vagrant/insecure_keys/key /home/vagrant/.ssh/id_rsa chown vagrant /home/vagrant/.ssh/id_rsa chmod 400 /home/vagrant/.ssh/id_rsa cd /home/vagrant/multicloud-k8s/kud/hosting_providers/vagrant/ && ./installer.sh | tee kud_installer.log diff --git a/kud/hosting_providers/vagrant/config/default.yml b/kud/hosting_providers/vagrant/config/default.yml index 10b93663..094c3594 100644 --- a/kud/hosting_providers/vagrant/config/default.yml +++ b/kud/hosting_providers/vagrant/config/default.yml @@ -37,7 +37,7 @@ memory: 32768 cpus: 16 volumes: - - name: sda + - name: sdb size: 50 mount: /var/lib/docker/ roles: diff --git a/kud/hosting_providers/vagrant/config/samples/pdf.yml.aio b/kud/hosting_providers/vagrant/config/samples/pdf.yml.aio index 48a3c938..a87f967e 100644 --- a/kud/hosting_providers/vagrant/config/samples/pdf.yml.aio +++ b/kud/hosting_providers/vagrant/config/samples/pdf.yml.aio @@ -13,7 +13,7 @@ memory: 32768 cpus: 16 volumes: - - name: sda + - name: sdb size: 50 mount: /var/lib/docker/ roles: diff --git a/kud/tests/plugin_collection_v2.sh b/kud/tests/plugin_collection_v2.sh index 068864d7..09dec5c4 100755 --- a/kud/tests/plugin_collection_v2.sh +++ b/kud/tests/plugin_collection_v2.sh @@ -42,7 +42,7 @@ project_description="test_project_description" userData1="user1" userData2="user2" -composite_app_name="test_composite_app" +composite_app_name="test_composite_app_collection" composite_app_description="test_project_description" composite_app_version="test_composite_app_version" app1_helm_path="$CSAR_DIR/$csar_id/collectd.tar.gz" @@ -58,12 +58,19 @@ app2_desc="prometheus_desc" main_composite_profile_name="main_composite_profile" sub_composite_profile_name1="test_composite_profile1" sub_composite_profile_name2="test_composite_profile2" -composite_profile_description="test_composite_profile_description" +main_composite_profile_description="main_composite_profile_description" +sub_composite_profile_description="sub_composite_profile_description" -genericPlacementIntentName1="test_gen_placement_intent1" -genericPlacementIntentName2="test_gen_placement_intent2" +genericPlacementIntentName="test_gen_placement_intent1" genericPlacementIntentDesc="test_gen_placement_intent_desc" logicalCloud="logical_cloud_name" + +appIntentNameForApp1="appIntentForApp1" +appIntentForApp1Desc="AppIntentForApp1Desc" +appIntentNameForApp2="appIntentForApp2" +appIntentForApp2Desc="AppIntentForApp2Desc" +providerName1="aws" +providerName2="azure" clusterName1="edge1" clusterName2="edge2" clusterLabelName1="east-us1" @@ -71,6 +78,9 @@ clusterLabelName2="east-us2" deploymentIntentGroupName="test_deployment_intent_group" deploymentIntentGroupNameDesc="test_deployment_intent_group_desc" +releaseName="test" +intentToBeAddedinDeploymentIntentGroup="name_of_intent_to_be_added_in_deployment_group" +intentToBeAddedinDeploymentIntentGroupDesc="desc_of_intent_to_be_added_in_deployment_group" chart_name="edgex" profile_name="test_profile" @@ -166,7 +176,7 @@ payload="$(cat <<EOF { "metadata":{ "name":"${main_composite_profile_name}", - "description":"${composite_profile_description}", + "description":"${main_composite_profile_description}", "userData1":"${userData1}", "userData2":"${userData2}" } @@ -183,7 +193,7 @@ payload="$(cat <<EOF { "metadata":{ "name":"${sub_composite_profile_name1}", - "description":"${composite_profile_description}", + "description":"${sub_composite_profile_description}", "userData1":"${userData1}", "userData2":"${userData2}" }, @@ -203,7 +213,7 @@ payload="$(cat <<EOF { "metadata":{ "name":"${sub_composite_profile_name2}", - "description":"${composite_profile_description}", + "description":"${sub_composite_profile_description}", "userData1":"${userData1}", "userData2":"${userData2}" }, @@ -224,25 +234,7 @@ print_msg "Registering GenericPlacementIntent for app1" payload="$(cat <<EOF { "metadata":{ - "name":"${genericPlacementIntentName1}", - "description":"${genericPlacementIntentDesc}", - "userData1":"${userData1}", - "userData2":"${userData2}" - }, - "spec":{ - "logical-cloud":"${logicalCloud}" - } -} -EOF -)" -call_api -d "${payload}" "${base_url}/projects/${project_name}/composite-apps/${composite_app_name}/${composite_app_version}/generic-placement-intents" - - -print_msg "Registering GenericPlacementIntent for app2" -payload="$(cat <<EOF -{ - "metadata":{ - "name":"${genericPlacementIntentName2}", + "name":"${genericPlacementIntentName}", "description":"${genericPlacementIntentDesc}", "userData1":"${userData1}", "userData2":"${userData2}" @@ -261,8 +253,8 @@ print_msg "Adding placement intent for app1(collectd)" payload="$(cat <<EOF { "metadata":{ - "name":"${genericPlacementIntentName1}", - "description":"${genericPlacementIntentDesc}", + "name":"${appIntentNameForApp1}", + "description":"${appIntentForApp1Desc}", "userData1":"${userData1}", "userData2":"${userData2}" }, @@ -270,18 +262,21 @@ payload="$(cat <<EOF "app-name":"${app1_name}", "intent":{ "allOf":[ - { + { "provider-name":"${providerName1}", "cluster-name":"${clusterName1}" }, { + "provider-name":"${providerName2}", "cluster-name":"${clusterName2}" }, { "anyOf":[ { + "provider-name":"${providerName1}", "cluster-label-name":"${clusterLabelName1}" }, { + "provider-name":"${providerName2}", "cluster-label-name":"${clusterLabelName2}" } ] @@ -292,14 +287,14 @@ payload="$(cat <<EOF } EOF )" -call_api -d "${payload}" "${base_url}/projects/${project_name}/composite-apps/${composite_app_name}/${composite_app_version}/generic-placement-intents/${genericPlacementIntentName1}/app-intents" +call_api -d "${payload}" "${base_url}/projects/${project_name}/composite-apps/${composite_app_name}/${composite_app_version}/generic-placement-intents/${genericPlacementIntentName}/app-intents" print_msg "Adding placement intent for app2(prometheus)" payload="$(cat <<EOF { "metadata":{ - "name":"${genericPlacementIntentName2}", - "description":"${genericPlacementIntentDesc}", + "name":"${appIntentNameForApp2}", + "description":"${appIntentForApp2Desc}", "userData1":"${userData1}", "userData2":"${userData2}" }, @@ -308,17 +303,21 @@ payload="$(cat <<EOF "intent":{ "allOf":[ { + "provider-name":"${providerName1}", "cluster-name":"${clusterName1}" }, { + "provider-name":"${providerName2}", "cluster-name":"${clusterName2}" }, { "anyOf":[ { + "provider-name":"${providerName1}", "cluster-label-name":"${clusterLabelName1}" }, { + "provider-name":"${providerName2}", "cluster-label-name":"${clusterLabelName2}" } ] @@ -329,7 +328,7 @@ payload="$(cat <<EOF } EOF )" -call_api -d "${payload}" "${base_url}/projects/${project_name}/composite-apps/${composite_app_name}/${composite_app_version}/generic-placement-intents/${genericPlacementIntentName2}/app-intents" +call_api -d "${payload}" "${base_url}/projects/${project_name}/composite-apps/${composite_app_name}/${composite_app_version}/generic-placement-intents/${genericPlacementIntentName}/app-intents" # END: Adding placement intent for each app in the composite app. # BEGIN: Registering DeploymentIntentGroup in the database @@ -344,20 +343,20 @@ payload="$(cat <<EOF }, "spec":{ "profile":"${main_composite_profile_name}", - "version":"${composite_app_version}", + "version":"${releaseName}", "override-values":[ { "app-name":"${app1_name}", "values": { - "imageRepository":"registry.hub.docker.com" + "collectd_prometheus.service.targetPort":"9104" } }, { "app-name":"${app2_name}", "values": { - "imageRepository":"registry.hub.docker.com" + "prometheus.service.nameOfPort":"WebPort9090" } } ] @@ -369,19 +368,18 @@ call_api -d "${payload}" "${base_url}/projects/${project_name}/composite-apps/${ # END: Registering DeploymentIntentGroup in the database # BEGIN: Adding intents to an intent group -print_msg "Adding two intents to the intent group" +print_msg "Adding the genericPlacement intent to the deploymentIntent group" payload="$(cat <<EOF { "metadata":{ - "name":"${deploymentIntentGroupName}", - "description":"${deploymentIntentGroupNameDesc}", + "name":"${intentToBeAddedinDeploymentIntentGroup}", + "description":"${intentToBeAddedinDeploymentIntentGroupDesc}", "userData1":"${userData1}", "userData2":"${userData2}" }, "spec":{ "intent":{ - "generic-placement-intent":"${genericPlacementIntentName1}", - "generic-placement-intent":"${genericPlacementIntentName2}" + "generic-placement-intent":"${genericPlacementIntentName}" } } } @@ -390,3 +388,8 @@ EOF call_api -d "${payload}" "${base_url}/projects/${project_name}/composite-apps/${composite_app_name}/${composite_app_version}/deployment-intent-groups/${deploymentIntentGroupName}/intents" # END: Adding intents to an intent group +#BEGIN: Instantiation +print_msg "Getting the sorted templates for each of the apps.." +call_api -d "" "${base_url}/projects/${project_name}/composite-apps/${composite_app_name}/${composite_app_version}/deployment-intent-groups/${deploymentIntentGroupName}/instantiate" +# END: Instantiation + diff --git a/kud/tests/vnfs/comp-app/collection/app1/profile/override_values.yaml b/kud/tests/vnfs/comp-app/collection/app1/profile/override_values.yaml index 304ae5de..b3c36804 100644 --- a/kud/tests/vnfs/comp-app/collection/app1/profile/override_values.yaml +++ b/kud/tests/vnfs/comp-app/collection/app1/profile/override_values.yaml @@ -1,8 +1,7 @@ collectd_prometheus: service: type: ClusterIP - name: collectd-override - port: 9103 + port: 9104 targetPort: 9103 selector: app: collectd diff --git a/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus/templates/service.yaml b/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus/templates/service.yaml index 0114ed2e..56fbb5f4 100644 --- a/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus/templates/service.yaml +++ b/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus/templates/service.yaml @@ -26,12 +26,12 @@ spec: {{- end }} {{- end }} ports: - - name: web + - name: {{ .Values.prometheus.service.nameOfPort }} {{- if eq .Values.prometheus.service.type "NodePort" }} nodePort: {{ .Values.global.nodePortPrefix }}{{ .Values.prometheus.service.nodePort }} {{- end }} port: 9090 - targetPort: web + targetPort: {{ .Values.prometheus.service.nameOfPort }} selector: app: prometheus prometheus: {{ template "prometheus.fullname" . }}-prometheus diff --git a/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus/values.yaml b/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus/values.yaml index e35c6735..fa528900 100644 --- a/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus/values.yaml +++ b/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus/values.yaml @@ -37,9 +37,10 @@ prometheus: - port: cadvisor-prometheus interval: 10s path: /metrics - + resources: {} service: + nameOfPort: web type: ClusterIP annotations: {} labels: {} @@ -67,3 +68,6 @@ prometheus: #type: NodePort sessionAffinity: "" + +global: + imagePullSecrets: ""
\ No newline at end of file diff --git a/kud/tests/vnfs/comp-app/collection/app2/profile/override_values.yaml b/kud/tests/vnfs/comp-app/collection/app2/profile/override_values.yaml index 6743ac5b..041fc40d 100644 --- a/kud/tests/vnfs/comp-app/collection/app2/profile/override_values.yaml +++ b/kud/tests/vnfs/comp-app/collection/app2/profile/override_values.yaml @@ -1,6 +1,6 @@ service: type: ClusterIP - name: Prometheus + nameOfPort: webPort annotations: {} labels: {} clusterIP: ""
\ No newline at end of file |