Merge pull request #85 from open-ness/openness_release_201202

Openness release 201202

group_vars/all/10-default.yml

@@ -41,7 +41,7 @@ os_remove_yum_plugins: true
 
 ### OpenNESS Git Repository
 # Following variable specify branch/SHA/tag to be checked out for the source repository
-git_repo_branch: openness-20.12.01
+git_repo_branch: openness-20.12.02
 
 # If True, the repository will be deleted and cloned again
 # If False, repository will be left as it is and any changes won't be overwritten.

group_vars/edgenode_vca_group/10-default.yml

@@ -14,5 +14,5 @@ os_remove_yum_plugins: true
 docker_images: []
 
 git_repo_url: https://{{ git_repo_token }}@github.com/open-ness/edgenode.git
-git_repo_branch: openness-20.12.01
+git_repo_branch: openness-20.12.02
 _git_repo_dest: "{{ openness_dir }}/edgenode"

offline_package_creator/package_definition_list/pdl_flexran.yml

@@ -11,13 +11,13 @@ github-repos:
     flag: tag
     value: master
   - name: sriov-network-device-plugin
-    url: https://github.com/intel/sriov-network-device-plugin
-    flag: commit
-    value: 4e0302aeb4812844524005686b74175d8b0fc515
+    url: https://github.com/k8snetworkplumbingwg/sriov-network-device-plugin
+    flag: tag
+    value: v3.3.1
   - name: sriov-cni
-    url: https://github.com/intel/sriov-cni
+    url: https://github.com/k8snetworkplumbingwg/sriov-cni
     flag: tag
-    value: v2.3
+    value: v2.6
   - name: rmd
     url: https://github.com/intel/rmd
     flag: tag
@@ -50,8 +50,8 @@ github-repos:
     url: https://github.com/goharbor/harbor-helm.git
     flag: tag
     value: v1.5.0
-  - name: x-epcforedge
-    url: https://github.com/open-ness/x-epcforedge.git
+  - name: ido-epcforedge
+    url: https://github.com/open-ness/ido-epcforedge.git
     flag: tag
     value: master
 
@@ -61,7 +61,7 @@ github-repos:
 # go modules are downloaded with the go.mod file
 go-modules:
   - name: edgenode
-  - name: x-epcforedge
+  - name: ido-epcforedge
   - name: rmd-operator
   - name: telemetry-aware-scheduling
 
@@ -224,7 +224,7 @@ pip-packages:
   - name: pyxattr
     url: 20/7a/2ae2a5a13e550b88cf4aa71aa60e1c2d58d7f002d4a2ccb9b4920f8dc84b/pyxattr-0.5.1.tar.gz
   - name: PyYAML
-    url: 9f/2c/9417b5c774792634834e730932745bc09a7d36754ca00acf1ccd1ac2594d/PyYAML-5.1.tar.gz
+    url: bd/da/0a49c1a31c60634b93fd1376b3b7966c4f81f2da8263f389cad5b6bbd6e8/PyYAML-4.2b1.tar.gz
   - name: requests
     url: ff/17/5cbb026005115301a8fb2f9b0e3e8d32313142fe8b617070e7baad20554f/requests-2.20.1-py2.py3-none-any.whl
   - name: subprocess32
@@ -268,7 +268,7 @@ pip-packages:
   - name: scandir
     url: df/f5/9c052db7bd54d0cbf1bc0bb6554362bba1012d03e5888950a4f5c5dadc4e/scandir-1.10.0.tar.gz
   - name: setuptools
-    url: a7/e0/30642b9c2df516506d40b563b0cbd080c49c6b3f11a70b4c7a670f13a78b/setuptools-50.3.2.zip
+    url: 12/68/95515eaff788370246dac534830ea9ccb0758e921ac9e9041996026ecaf2/setuptools-53.0.0.tar.gz
   - name: subprocess32
     url: 32/c8/564be4d12629b912ea431f1a50eb8b3b9d00f1a0b1ceff17f266be190007/subprocess32-3.5.4.tar.gz
   - name: texttable
@@ -278,7 +278,7 @@ pip-packages:
   - name: configparser
     url: 7a/2a/95ed0501cf5d8709490b1d3a3f9b5cf340da6c433f896bbe9ce08dbe6785/configparser-4.0.2-py2.py3-none-any.whl
   - name: cryptography
-    url: 66/58/d7ff652d30e8cbabd8946b3116fba73b39a73ea9c63943b3c1bf3cfcf190/cryptography-3.0-cp27-cp27mu-manylinux1_x86_64.whl
+    url: c6/0e/561d53ee8f95803b006a90050875a915c147af39142716a0c6c81263fe63/cryptography-3.2.1-cp27-cp27mu-manylinux1_x86_64.whl
   - name: google_auth
     url: 1f/cf/724b6436967a8be879c8de16b09fd80e0e7b0bcad462f5c09ee021605785/google_auth-1.22.1-py2.py3-none-any.whl
   - name: pyrsistent

offline_package_creator/scripts/common.sh

@@ -439,7 +439,7 @@ opc::download::gomodules() {
       rm -f "$OPC_DOWNLOAD_PATH"/ret
     fi
     touch "$OPC_DOWNLOAD_PATH"/ret
-    if [[ "$name" == "edgenode" || "$name" == "x-epcforedge" ]];then
+    if [[ "$name" == "edgenode" || "$name" == "ido-epcforedge" ]];then
       dirs=$(find . -name go.mod)
       for dir in $dirs
       do

roles/kubernetes/cni/sriov/controlplane/defaults/main.yml

@@ -6,14 +6,14 @@
 _sriov_chart_dir: "{{ ne_helm_charts_default_dir }}/sriov-net-dp"
 
 _sriov_cni:
-  url: "https://github.com/intel/sriov-cni"
+  url: "https://github.com/k8snetworkplumbingwg/sriov-cni"
   download_dir : "/tmp/_sriov_cni"
-  commit: "v2.3"
+  commit: "v2.6"
 
 _sriov_dev_plugin:
-  url: "https://github.com/intel/sriov-network-device-plugin"
+  url: "https://github.com/k8snetworkplumbingwg/sriov-network-device-plugin"
   download_dir: "/tmp/_sriov_dev_plugin"
-  commit: "4e0302aeb4812844524005686b74175d8b0fc515"
+  commit: "v3.3.1"
 
 fpga_sriov_userspace_enable: false
 acc100_sriov_userspace_enable: false

roles/telemetry/collectd/controlplane/files/Dockerfile

@@ -7,7 +7,7 @@ ENV http_proxy=$http_proxy
 ENV https_proxy=$https_proxy
 
 RUN yum install -y gcc gcc-c++ cmake make autoconf automake libxml2 libxml2-devel json-c-devel boost ncurses ncurses-devel ncurses-libs boost-devel libuuid libuuid-devel python2-jsonschema doxygen hwloc-devel libpng12 rsync openssl-devel bc python-devel python-libs python-sphinx openssl unzip which wget python36 epel-release flex bison libtool pkgconfig git patch OpenIPMI ipmitool OpenIPMI-devel yajl yajl-devel protobuf-c protobuf-c-devel libmicrohttpd libmicrohttpd-devel
-RUN easy_install pip && pip install intelhex
+RUN easy_install pip==20.3.3 && pip install intelhex
 
 # RT repo
 RUN wget http://linuxsoft.cern.ch/cern/centos/7/rt/CentOS-RT.repo -O /etc/yum.repos.d/CentOS-RT.repo

roles/telemetry/tas/files/extend_scheduler.yml

@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2021 Intel Corporation
+
+---
+
+- op: add
+  path: /spec/containers/0/command/-
+  value: --config=/etc/kubernetes/scheduler-config.yml
+- op: add
+  path: /spec/volumes/-
+  value:
+    hostPath:
+      path: /etc/kubernetes/scheduler-config.yml
+      type: File
+    name: config
+- op: add
+  path: /spec/containers/0/volumeMounts/-
+  value:
+    mountPath: /etc/kubernetes/scheduler-config.yml
+    name: config
+    readOnly: true

roles/telemetry/tas/files/kustomization_scheduler.yaml

@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2021 Intel Corporation
+
+---
+
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: kube-system
+resources:
+  - kube-scheduler.yaml
+
+patchesJson6902:
+  - target:
+      version: v1
+      kind: Pod
+      name: kube-scheduler
+    path: extend_scheduler.yml

roles/telemetry/tas/tasks/main.yml

@@ -140,26 +140,49 @@
 
 - name: Kubernetes Scheduler Extender
   block:
-  - name: replace TAS service url
-    replace:
-      path: "{{ tmp_dir.path }}/tas-repo/deploy/extender-configuration/scheduler-extender-configmap.yaml"
-      regexp: 'https://tas-service\.default\.svc\.cluster\.local:9001'
-      replace: "{{ _tas_svc_url }}"
-
-  - name: patch Kubernetes Scheduler Extender configuration script
-    patch:
-      src: "configure-scheduler.sh.patch"
-      dest: "{{ tmp_dir.path }}/tas-repo/deploy/extender-configuration/configure-scheduler.sh"
-
-  - name: configure Kubernetes Scheduler Extender
-    command: "bash configure-scheduler.sh {{ _tas_svc_domain }}"
-    register: configure_scheduler_result
-    failed_when: "configure_scheduler_result.rc != 0 or
-                  ('error:' in configure_scheduler_result.stderr and 'already exists' not in configure_scheduler_result.stderr)"
-    changed_when: true
-    args:
-      chdir: "{{ tmp_dir.path }}/tas-repo/deploy/extender-configuration"
-    become: yes
+  - name: copy Scheduler config
+    template:
+      src: "scheduler-config.yml"
+      dest: "/etc/kubernetes/scheduler-config.yml"
+
+  - name: backup Scheduler manifest
+    copy:
+      src: /etc/kubernetes/manifests/kube-scheduler.yaml
+      dest: /etc/kubernetes/manifests/kube-scheduler.yaml_bak
+      remote_src: true
+
+  - name: copy Scheduler kustomization file
+    copy:
+      src: kustomization_scheduler.yaml
+      dest:  "/etc/kubernetes/manifests/kustomization.yaml"
+
+  - name: copy Scheduler kustomization patch file
+    copy:
+      src: extend_scheduler.yml
+      dest:  "/etc/kubernetes/manifests/"
+
+  - name: kustomize Scheduler
+    block:
+      - name: save kustomized definition
+        shell: kubectl kustomize . > tmp
+        args:
+          chdir: "/etc/kubernetes/manifests/"
+        changed_when: true
+      - name: overwrite Scheduler manifest
+        copy:
+          src: "/etc/kubernetes/manifests/tmp"
+          dest: "/etc/kubernetes/manifests/kube-scheduler.yaml"
+          remote_src: true
+      - name: delete temporary file
+        file:
+          path: "/etc/kubernetes/manifests/tmp"
+          state: absent
+
+  - name: add TAS URL to no_proxy
+    command: "{{ item }}"
+    with_items:
+      - "perl -i -p0e \"s/(name: NO_PROXY\\n.*)/\\1,{{ _tas_svc_domain }}/gm\" /etc/kubernetes/manifests/kube-scheduler.yaml"
+      - "perl -i -p0e \"s/(name: no_proxy\\n.*)/\\1,{{ _tas_svc_domain }}/gm\" /etc/kubernetes/manifests/kube-scheduler.yaml"
 
   - name: create Scheduler Extender secret
     command: kubectl -n telemetry create secret tls extender-secret --cert /etc/kubernetes/pki/ca.crt --key /etc/kubernetes/pki/ca.key

roles/telemetry/tas/templates/scheduler-config.yml

@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2021 Intel Corporation
+
+---
+
+apiVersion: kubescheduler.config.k8s.io/v1beta1
+kind: KubeSchedulerConfiguration
+clientConnection:
+  kubeconfig: /etc/kubernetes/scheduler.conf
+extenders:
+  - urlPrefix: "{{ _tas_svc_url }}"
+    prioritizeVerb: "scheduler/prioritize"
+    filterVerb: "scheduler/filter"
+    weight: 1
+    enableHTTPS: true
+    managedResources:
+      - name: "telemetry/scheduling"
+        ignoredByScheduler: true
+    ignorable: true