diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 45eb94b..722f2e9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,9 +16,9 @@ jobs: check-super-linter: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.4.0 + - uses: actions/checkout@v3.5.2 - name: Check super-linter - uses: github/super-linter@v4.10.1 + uses: github/super-linter@v5.0.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} LINTER_RULES_PATH: .github/linters diff --git a/.github/workflows/on-demand_ci.yml b/.github/workflows/on-demand_ci.yml index 2ff1c60..a9a3bdb 100644 --- a/.github/workflows/on-demand_ci.yml +++ b/.github/workflows/on-demand_ci.yml @@ -24,7 +24,7 @@ jobs: name: Check scripts format runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.4.0 + - uses: actions/checkout@v3.5.2 - name: Run the sh-checker uses: luizm/action-sh-checker@v0.7.0 env: @@ -44,7 +44,7 @@ jobs: env: DEBUG: true steps: - - uses: actions/checkout@v3.4.0 + - uses: actions/checkout@v3.5.2 - name: Install dependencies and configures kind clusters working-directory: ./scripts run: ./install.sh diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index f366d5f..5e2f521 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -19,7 +19,7 @@ jobs: check-dockerfile: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.4.0 + - uses: actions/checkout@v3.5.2 - name: update Dockerfile uses: ludeeus/dockerfile-updater@21.01.0 with: diff --git a/nephio-ansible-install/README.md b/nephio-ansible-install/README.md index b15ba53..ad7104b 100644 --- a/nephio-ansible-install/README.md +++ b/nephio-ansible-install/README.md @@ -69,10 +69,10 @@ all: install_dir: nephio-install packages_url: https://github.com/nephio-project/nephio-packages.git clusters: - mgmt: {mgmt_subnet: 172.88.0.0/16, pod_subnet: 10.196.0.0/16, svc_subnet: 10.96.0.0/16} - edge1: {mgmt_subnet: 172.89.0.0/16, pod_subnet: 10.197.0.0/16, svc_subnet: 10.97.0.0/16} - edge2: {mgmt_subnet: 172.90.0.0/16, pod_subnet: 10.198.0.0/16, svc_subnet: 10.98.0.0/16} - region1: {mgmt_subnet: 172.91.0.0/16, pod_subnet: 10.199.0.0/16, svc_subnet: 10.99.0.0/16} + mgmt: {mgmt_subnet: 172.88.0.0/16, pod_subnet: 10.196.0.0/16, svc_subnet: 10.96.0.0/16, master_iface: eth1} + edge1: {mgmt_subnet: 172.89.0.0/16, pod_subnet: 10.197.0.0/16, svc_subnet: 10.97.0.0/16, master_iface: eth1} + edge2: {mgmt_subnet: 172.90.0.0/16, pod_subnet: 10.198.0.0/16, svc_subnet: 10.98.0.0/16, master_iface: eth1} + region1: {mgmt_subnet: 172.91.0.0/16, pod_subnet: 10.199.0.0/16, svc_subnet: 10.99.0.0/16, master_iface: eth1} children: vm: hosts: @@ -88,6 +88,7 @@ Some customizations are required to tailor the installation to your environment. - gitea docker container will be created at runtime. - gitea_username: your [gitea](https://gitea.io) (local repository) username - gitea_password: your [gitea](https://gitea.io) (local repository) password +- master_iface: the interface name on the node where the API server is accessible, the default value is `eth1` for KIND clusters deployed by ansible scripts. The value for this field may need to be updated for non-KIND cluster deployments. Note: You can choose between using remote GitHub repositories or local gitea repositories for your Nephio environment by setting either the GitHub variables or the gitea variables. diff --git a/nephio-ansible-install/nind/nephio.yaml b/nephio-ansible-install/nind/nephio.yaml index 80be9a8..8850dc6 100644 --- a/nephio-ansible-install/nind/nephio.yaml +++ b/nephio-ansible-install/nind/nephio.yaml @@ -4,6 +4,8 @@ all: cloud_user: user gitea_username: nephio gitea_password: nephio + validate_certs: true # change this to false if you want to avoid ssl/tls check + container_engine: docker # either docker or podman proxy: http_proxy: https_proxy: diff --git a/nephio-ansible-install/roles/nephio/config/templates/cluster-context.j2 b/nephio-ansible-install/roles/nephio/config/templates/cluster-context.j2 index ca44c1c..910db75 100644 --- a/nephio-ansible-install/roles/nephio/config/templates/cluster-context.j2 +++ b/nephio-ansible-install/roles/nephio/config/templates/cluster-context.j2 @@ -6,4 +6,4 @@ spec: siteCode: {{ item.key }} cniConfig: cniType: macvlan - masterInterface: eth1 \ No newline at end of file + masterInterface: {{ item.value.master_iface }} \ No newline at end of file