From 37747578b8fe7fed071aa2ed516454cb59fef51d Mon Sep 17 00:00:00 2001 From: Cezary Marczak Date: Tue, 19 Jan 2021 15:44:17 +0100 Subject: [PATCH 1/8] [BACKPORT] OP-6419 Fix for Scheduler Preemption {4ef5e4ef} Usage of a kube-scheduler's deprecated --policy-config setting was breaking the preemption with a message: 'No PostFilter plugins are registered, so no preemption will be performed' Switching to --config resolved the issue. Source: PR#752 --- .../telemetry/tas/files/extend_scheduler.yml | 21 +++++++ .../tas/files/kustomization_scheduler.yaml | 17 +++++ roles/telemetry/tas/tasks/main.yml | 63 +++++++++++++------ .../tas/templates/scheduler-config.yml | 19 ++++++ 4 files changed, 100 insertions(+), 20 deletions(-) create mode 100644 roles/telemetry/tas/files/extend_scheduler.yml create mode 100644 roles/telemetry/tas/files/kustomization_scheduler.yaml create mode 100644 roles/telemetry/tas/templates/scheduler-config.yml diff --git a/roles/telemetry/tas/files/extend_scheduler.yml b/roles/telemetry/tas/files/extend_scheduler.yml new file mode 100644 index 00000000..1273c0ee --- /dev/null +++ b/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 diff --git a/roles/telemetry/tas/files/kustomization_scheduler.yaml b/roles/telemetry/tas/files/kustomization_scheduler.yaml new file mode 100644 index 00000000..897427d0 --- /dev/null +++ b/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 diff --git a/roles/telemetry/tas/tasks/main.yml b/roles/telemetry/tas/tasks/main.yml index dcd325df..7078656a 100644 --- a/roles/telemetry/tas/tasks/main.yml +++ b/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 diff --git a/roles/telemetry/tas/templates/scheduler-config.yml b/roles/telemetry/tas/templates/scheduler-config.yml new file mode 100644 index 00000000..e416ae0d --- /dev/null +++ b/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 From ac2792a12386f0e687a98212cb538e8ceff0d276 Mon Sep 17 00:00:00 2001 From: Patryk Matuszak <47594217+patrykxmatuszak@users.noreply.github.com> Date: Tue, 19 Jan 2021 10:46:02 +0100 Subject: [PATCH 2/8] [BACKPORT] Workaround for building sriov's device plugin image (#749) {514a2c99} https://github.com/k8snetworkplumbingwg/sriov-network-device-plugin/blob/master/images/Dockerfile contains `FROM alpine` but this pulls version 3.13 in which the package is no longer named `hwdata-pci`, instead it's `hwids-pci` (since 3.11). This commit introduces workaround to keep the package name as is and keep it from breaking CERA's functionality. --- roles/kubernetes/cni/sriov/controlplane/tasks/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/kubernetes/cni/sriov/controlplane/tasks/main.yml b/roles/kubernetes/cni/sriov/controlplane/tasks/main.yml index ad9c93f7..5f327f1c 100644 --- a/roles/kubernetes/cni/sriov/controlplane/tasks/main.yml +++ b/roles/kubernetes/cni/sriov/controlplane/tasks/main.yml @@ -76,6 +76,12 @@ source: local when: offline_enable + - name: "[WORKAROUND] change alpine tag to build the image" + replace: + path: "{{ _sriov_dev_plugin.download_dir }}/images/Dockerfile" + regexp: "^FROM alpine$" + replace: "FROM alpine:3.10" + - name: build device plugin image command: make image args: From 2bcd218834cf0c2f2b30afadc996cd0f67b772b3 Mon Sep 17 00:00:00 2001 From: Cezary Marczak <57795129+cezaryxmarczak@users.noreply.github.com> Date: Tue, 26 Jan 2021 15:54:53 +0100 Subject: [PATCH 3/8] [BACKPORT] OP-6535 Fix SRIOV DP image build (#759) {9f1a1711} Package download fails for golang:alpine. Switched to golang:alpine3.10. --- .../cni/sriov/controlplane/tasks/main.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/roles/kubernetes/cni/sriov/controlplane/tasks/main.yml b/roles/kubernetes/cni/sriov/controlplane/tasks/main.yml index 5f327f1c..31600cd3 100644 --- a/roles/kubernetes/cni/sriov/controlplane/tasks/main.yml +++ b/roles/kubernetes/cni/sriov/controlplane/tasks/main.yml @@ -53,6 +53,12 @@ until: result is succeeded ignore_errors: yes + - name: "[WORKAROUND] change golang:alpine tag to build the CNI image" + replace: + path: "{{ _sriov_cni.download_dir }}/Dockerfile" + regexp: "^FROM golang:alpine as builder$" + replace: "FROM golang:alpine3.10 as builder" + - name: build CNI image docker_image: build: @@ -76,12 +82,18 @@ source: local when: offline_enable - - name: "[WORKAROUND] change alpine tag to build the image" + - name: "[WORKAROUND] change alpine tag to build the DP image" replace: path: "{{ _sriov_dev_plugin.download_dir }}/images/Dockerfile" regexp: "^FROM alpine$" replace: "FROM alpine:3.10" + - name: "[WORKAROUND] change golang:alpine tag to build the DP image" + replace: + path: "{{ _sriov_dev_plugin.download_dir }}/images/Dockerfile" + regexp: "^FROM golang:alpine as builder$" + replace: "FROM golang:alpine3.10 as builder" + - name: build device plugin image command: make image args: From ce0665d40d159caf56048a3e7772d02839daa880 Mon Sep 17 00:00:00 2001 From: MariuszSzczepanik <67258433+MariuszSzczepanik@users.noreply.github.com> Date: Wed, 27 Jan 2021 14:35:14 +0100 Subject: [PATCH 4/8] [BACKPORT] Fix pip version in collectd (#763) {ab896e86} --- roles/telemetry/collectd/controlplane/files/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/telemetry/collectd/controlplane/files/Dockerfile b/roles/telemetry/collectd/controlplane/files/Dockerfile index 56385f3e..f9e7ad0d 100644 --- a/roles/telemetry/collectd/controlplane/files/Dockerfile +++ b/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 From 07942fcd9824460733fd5cdfa71e897616c96b44 Mon Sep 17 00:00:00 2001 From: Szymon Konefal Date: Thu, 28 Jan 2021 13:46:56 +0100 Subject: [PATCH 5/8] [BACKPORT] Update sriov-cni to v2.6 and sriov-net-device plugin to v3.3.1 (#772) {f0a2e3b9} Ported from an open PR #772 --- .../package_definition_list/pdl_flexran.yml | 6 +++--- .../cni/sriov/controlplane/defaults/main.yml | 4 ++-- .../cni/sriov/controlplane/tasks/main.yml | 18 ------------------ 3 files changed, 5 insertions(+), 23 deletions(-) diff --git a/offline_package_creator/package_definition_list/pdl_flexran.yml b/offline_package_creator/package_definition_list/pdl_flexran.yml index bd03806f..9f1078a6 100644 --- a/offline_package_creator/package_definition_list/pdl_flexran.yml +++ b/offline_package_creator/package_definition_list/pdl_flexran.yml @@ -12,12 +12,12 @@ github-repos: value: master - name: sriov-network-device-plugin url: https://github.com/intel/sriov-network-device-plugin - flag: commit - value: 4e0302aeb4812844524005686b74175d8b0fc515 + flag: tag + value: v3.3.1 - name: sriov-cni url: https://github.com/intel/sriov-cni flag: tag - value: v2.3 + value: v2.6 - name: rmd url: https://github.com/intel/rmd flag: tag diff --git a/roles/kubernetes/cni/sriov/controlplane/defaults/main.yml b/roles/kubernetes/cni/sriov/controlplane/defaults/main.yml index fbfda3a8..a30034a1 100644 --- a/roles/kubernetes/cni/sriov/controlplane/defaults/main.yml +++ b/roles/kubernetes/cni/sriov/controlplane/defaults/main.yml @@ -8,12 +8,12 @@ _sriov_chart_dir: "{{ ne_helm_charts_default_dir }}/sriov-net-dp" _sriov_cni: url: "https://github.com/intel/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" download_dir: "/tmp/_sriov_dev_plugin" - commit: "4e0302aeb4812844524005686b74175d8b0fc515" + commit: "v3.3.1" fpga_sriov_userspace_enable: false acc100_sriov_userspace_enable: false diff --git a/roles/kubernetes/cni/sriov/controlplane/tasks/main.yml b/roles/kubernetes/cni/sriov/controlplane/tasks/main.yml index 31600cd3..ad9c93f7 100644 --- a/roles/kubernetes/cni/sriov/controlplane/tasks/main.yml +++ b/roles/kubernetes/cni/sriov/controlplane/tasks/main.yml @@ -53,12 +53,6 @@ until: result is succeeded ignore_errors: yes - - name: "[WORKAROUND] change golang:alpine tag to build the CNI image" - replace: - path: "{{ _sriov_cni.download_dir }}/Dockerfile" - regexp: "^FROM golang:alpine as builder$" - replace: "FROM golang:alpine3.10 as builder" - - name: build CNI image docker_image: build: @@ -82,18 +76,6 @@ source: local when: offline_enable - - name: "[WORKAROUND] change alpine tag to build the DP image" - replace: - path: "{{ _sriov_dev_plugin.download_dir }}/images/Dockerfile" - regexp: "^FROM alpine$" - replace: "FROM alpine:3.10" - - - name: "[WORKAROUND] change golang:alpine tag to build the DP image" - replace: - path: "{{ _sriov_dev_plugin.download_dir }}/images/Dockerfile" - regexp: "^FROM golang:alpine as builder$" - replace: "FROM golang:alpine3.10 as builder" - - name: build device plugin image command: make image args: From c73270378efde7cb81c8f04de55c96a5ad5e66fb Mon Sep 17 00:00:00 2001 From: Szymon Konefal Date: Fri, 29 Jan 2021 14:16:36 +0100 Subject: [PATCH 6/8] [BACKPORT] Update sriov github links to 'k8snetworkplumbingwg' space (#772) {fbcd9a83} Ported from the PR #772 --- .../package_definition_list/pdl_flexran.yml | 4 ++-- roles/kubernetes/cni/sriov/controlplane/defaults/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/offline_package_creator/package_definition_list/pdl_flexran.yml b/offline_package_creator/package_definition_list/pdl_flexran.yml index 9f1078a6..fea1a1b1 100644 --- a/offline_package_creator/package_definition_list/pdl_flexran.yml +++ b/offline_package_creator/package_definition_list/pdl_flexran.yml @@ -11,11 +11,11 @@ github-repos: flag: tag value: master - name: sriov-network-device-plugin - url: https://github.com/intel/sriov-network-device-plugin + 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.6 - name: rmd diff --git a/roles/kubernetes/cni/sriov/controlplane/defaults/main.yml b/roles/kubernetes/cni/sriov/controlplane/defaults/main.yml index a30034a1..18e5cd50 100644 --- a/roles/kubernetes/cni/sriov/controlplane/defaults/main.yml +++ b/roles/kubernetes/cni/sriov/controlplane/defaults/main.yml @@ -6,12 +6,12 @@ _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.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: "v3.3.1" From 4b1b126d090d13ce3c63a7a5a38495efbb97fc3a Mon Sep 17 00:00:00 2001 From: Jiang Date: Wed, 3 Feb 2021 18:40:27 +0800 Subject: [PATCH 7/8] [BACKPORT] [OP_6859] update pip package version (#788) {bcd6b88d} Taken from an open PR #788 --- .../package_definition_list/pdl_flexran.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/offline_package_creator/package_definition_list/pdl_flexran.yml b/offline_package_creator/package_definition_list/pdl_flexran.yml index fea1a1b1..605ac83f 100644 --- a/offline_package_creator/package_definition_list/pdl_flexran.yml +++ b/offline_package_creator/package_definition_list/pdl_flexran.yml @@ -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 From 334d8d1a921de9af3b646a22d28f676de9adf4ab Mon Sep 17 00:00:00 2001 From: Christopher Nolan Date: Tue, 9 Feb 2021 17:41:08 +0000 Subject: [PATCH 8/8] Update paths --- README.md | 2 +- cloud/porter.yaml | 2 +- group_vars/all/10-default.yml | 2 +- group_vars/controller_group/10-default.yml | 2 +- group_vars/edgenode_group/10-default.yml | 2 +- group_vars/edgenode_vca_group/10-default.yml | 4 ++-- offline_package_creator/README.md | 4 ++-- .../package_definition_list/pdl_flexran.yml | 8 ++++---- offline_package_creator/scripts/common.sh | 8 ++++---- offline_package_creator/scripts/initrc | 2 +- offline_package_creator/scripts/run.sh.bak | 6 +++--- roles/emco/controlplane/defaults/main.yml | 2 +- roles/emco/controlplane/tasks/main.yml | 2 +- roles/golang/tasks/main.yml | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 2a9bdbe6..8ba0245c 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,4 @@ SPDX-License-Identifier: Apache-2.0 Copyright (c) 2019 Intel Corporation ``` -For documentation please refer to https://github.com/otcshare/specs/blob/master/doc/getting-started/openness-experience-kits.md +For documentation please refer to https://github.com/open-ness/specs/blob/master/doc/getting-started/openness-experience-kits.md diff --git a/cloud/porter.yaml b/cloud/porter.yaml index 2411bf25..c4642d6f 100644 --- a/cloud/porter.yaml +++ b/cloud/porter.yaml @@ -24,7 +24,7 @@ parameters: - name: git_repo type: string description: "OpenNESS experience kit repository url" - default: "https://github.com/otcshare/openness-experience-kits" + default: "https://github.com/open-ness/openness-experience-kits" applyTo: - install diff --git a/group_vars/all/10-default.yml b/group_vars/all/10-default.yml index e93f34e7..eceef499 100644 --- a/group_vars/all/10-default.yml +++ b/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: master +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. diff --git a/group_vars/controller_group/10-default.yml b/group_vars/controller_group/10-default.yml index 42ef387a..f01fa774 100644 --- a/group_vars/controller_group/10-default.yml +++ b/group_vars/controller_group/10-default.yml @@ -65,7 +65,7 @@ os_yum_base_packages: ## URLs to docker images saved with `docker save : | gzip > .tar.gz` that are going to be preloaded after docker setup docker_images: [] -git_repo_url: https://{{ git_repo_token }}@github.com/otcshare/edgenode.git +git_repo_url: https://{{ git_repo_token }}@github.com/open-ness/edgenode.git _git_repo_dest: "{{ openness_dir }}/edgenode" ## Network Edge Helm Charts Storage Default Directory diff --git a/group_vars/edgenode_group/10-default.yml b/group_vars/edgenode_group/10-default.yml index dafaeab2..cd586d4b 100644 --- a/group_vars/edgenode_group/10-default.yml +++ b/group_vars/edgenode_group/10-default.yml @@ -85,5 +85,5 @@ _os_yum_exclude_rpm_packages: "exclude=kernel-3* kernel-rt* kernel-rt-kvm* kerne # URLs to docker images saved with `docker save : | gzip > .tar.gz` that are going to be preloaded after docker setup docker_images: [] -git_repo_url: https://{{ git_repo_token }}@github.com/otcshare/edgenode.git +git_repo_url: https://{{ git_repo_token }}@github.com/open-ness/edgenode.git _git_repo_dest: "{{ openness_dir }}/edgenode" diff --git a/group_vars/edgenode_vca_group/10-default.yml b/group_vars/edgenode_vca_group/10-default.yml index a9160043..51c32131 100644 --- a/group_vars/edgenode_vca_group/10-default.yml +++ b/group_vars/edgenode_vca_group/10-default.yml @@ -13,6 +13,6 @@ os_remove_yum_plugins: true ## URLs to docker images saved with `docker save : | gzip > .tar.gz` that are going to be preloaded after docker setup docker_images: [] -git_repo_url: https://{{ git_repo_token }}@github.com/otcshare/edgenode.git -git_repo_branch: master +git_repo_url: https://{{ git_repo_token }}@github.com/open-ness/edgenode.git +git_repo_branch: openness-20.12.02 _git_repo_dest: "{{ openness_dir }}/edgenode" diff --git a/offline_package_creator/README.md b/offline_package_creator/README.md index 05267f56..48e11bb5 100644 --- a/offline_package_creator/README.md +++ b/offline_package_creator/README.md @@ -100,7 +100,7 @@ sudo_cmd() { echo $PASSWD | sudo -S $@ } -# otcshare token +# open-ness token GITHUB_USERNAME="name" GITHUB_TOKEN="1111234rr47af7f1130d385f912fcfafdafdaf" @@ -166,7 +166,7 @@ The one is for making new docker user effective, another is for updating the ker After rebooting, run the command of "./offline_package_creator.sh all". -At the end, the script will download all the files defined in the [pdl_flexran.yml](https://github.com/otcshare/openness-experience-kits/blob/master/offline_package_creator/package_definition_list/pdl_flexran.yml) and build other necessary images, then copy them to a designated directory. Once the script is finished executing, the user should expect three files under the `openness-experience-kits/roles/offline_roles/unpack_offline_package/files` directory: +At the end, the script will download all the files defined in the [pdl_flexran.yml](https://github.com/open-ness/openness-experience-kits/blob/master/offline_package_creator/package_definition_list/pdl_flexran.yml) and build other necessary images, then copy them to a designated directory. Once the script is finished executing, the user should expect three files under the `openness-experience-kits/roles/offline_roles/unpack_offline_package/files` directory: ```shell [root@dev offline_package_creator]# ls -l ../roles/offline_roles/unpack_offline_package/files total 7888744 diff --git a/offline_package_creator/package_definition_list/pdl_flexran.yml b/offline_package_creator/package_definition_list/pdl_flexran.yml index 605ac83f..454f9274 100644 --- a/offline_package_creator/package_definition_list/pdl_flexran.yml +++ b/offline_package_creator/package_definition_list/pdl_flexran.yml @@ -7,7 +7,7 @@ github-repos: - name: edge-node-repo - url: https://github.com/otcshare/edgenode.git + url: https://github.com/open-ness/edgenode.git flag: tag value: master - name: sriov-network-device-plugin @@ -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/otcshare/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 diff --git a/offline_package_creator/scripts/common.sh b/offline_package_creator/scripts/common.sh index 060008f8..86fb5ada 100644 --- a/offline_package_creator/scripts/common.sh +++ b/offline_package_creator/scripts/common.sh @@ -376,11 +376,11 @@ opc::download::github() { url=$(echo "$list" | cut -d ',' -f 2) flag=$(echo "$list" | cut -d ',' -f 3) value=$(echo "$list" | cut -d ',' -f 4) - # otcshare git repo need a token - ret=$(opc::check::exist "$url" "otcshare") + # open-ness git repo need a token + ret=$(opc::check::exist "$url" "open-ness") if [[ "$ret" -eq 0 ]];then if [ -z "$GITHUB_TOKEN" ];then - opc::log::error "Cannot download otcshare code!" + opc::log::error "Cannot download open-ness code!" fi part1=$(echo "$url" | cut -d ':' -f 1) part2=$(echo "$url" | cut -d ':' -f 2) @@ -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 diff --git a/offline_package_creator/scripts/initrc b/offline_package_creator/scripts/initrc index c989e86f..8e24b964 100644 --- a/offline_package_creator/scripts/initrc +++ b/offline_package_creator/scripts/initrc @@ -19,7 +19,7 @@ sudo_cmd() { echo $PASSWD | sudo -S $@ } -# otcshare token +# open-ness token GITHUB_USERNAME="" GITHUB_TOKEN="" diff --git a/offline_package_creator/scripts/run.sh.bak b/offline_package_creator/scripts/run.sh.bak index ef631392..6025d483 100755 --- a/offline_package_creator/scripts/run.sh.bak +++ b/offline_package_creator/scripts/run.sh.bak @@ -10,12 +10,12 @@ cd /opt/app echo "MOD downloading, please wait..." mv go.mod go.mod.bak -line=$(grep 'otcshare/common' go.mod.bak) +line=$(grep 'open-ness/common' go.mod.bak) cat << EOF > go.mod // SPDX-License-Identifier: Apache-2.0 // Copyright (c) 2019-2020 Intel Corporation -module github.com/otcshare/edgenode +module github.com/open-ness/edgenode go 1.15 @@ -26,7 +26,7 @@ EOF go mod download cp -f go.mod.bak go.mod -sed -i '/otcshare\/common/d' go.mod +sed -i '/open-ness\/common/d' go.mod export GOPROXY="https://proxy.golang.org" go mod download diff --git a/roles/emco/controlplane/defaults/main.yml b/roles/emco/controlplane/defaults/main.yml index 522722f6..1e6eab18 100644 --- a/roles/emco/controlplane/defaults/main.yml +++ b/roles/emco/controlplane/defaults/main.yml @@ -4,6 +4,6 @@ --- _emco: - repo: https://github.com/otcshare/EMCO + repo: https://github.com/open-ness/EMCO commit: main dest: /opt/emco diff --git a/roles/emco/controlplane/tasks/main.yml b/roles/emco/controlplane/tasks/main.yml index 8f643ce2..b8f93936 100644 --- a/roles/emco/controlplane/tasks/main.yml +++ b/roles/emco/controlplane/tasks/main.yml @@ -26,7 +26,7 @@ #- name: clone emco repo # git: -# repo: "https://{{ git_repo_token }}@github.com/otcshare/EMCO.git" +# repo: "https://{{ git_repo_token }}@github.com/open-ness/EMCO.git" # dest: "/opt/emco/" # update: no # version: main diff --git a/roles/golang/tasks/main.yml b/roles/golang/tasks/main.yml index 55c2f3a3..5a4cb448 100644 --- a/roles/golang/tasks/main.yml +++ b/roles/golang/tasks/main.yml @@ -41,7 +41,7 @@ with_items: - "export GOROOT=/usr/local/go" - "export GOPATH=~/go" - - "export GOPRIVATE=github.com/otcshare" + - "export GOPRIVATE=github.com/open-ness" - "export PATH=$GOPATH/bin:$GOROOT/bin:$PATH" - name: Get offline modules