From a79226519ade85e0860661adb3768c71cbd0e1e4 Mon Sep 17 00:00:00 2001 From: Alex Masi Date: Fri, 5 May 2023 23:25:40 +0000 Subject: [PATCH 1/7] Upgrade arista ceoslab operator to v2.0.2 and enable gnoi --- cloudbuild/vendors/topology.textproto | 9 ++++- cloudbuild/vendors/vendors_test.go | 2 +- examples/arista/ceos/ceos.pb.txt | 37 ++++++++++++++++++++- examples/juniper/cptx-ixia/cptx-ixia.pb.txt | 1 + examples/multivendor/multivendor.pb.txt | 23 ++++++++++++- go.mod | 2 +- go.sum | 4 +-- manifests/controllers/ceoslab/manifest.yaml | 2 +- 8 files changed, 72 insertions(+), 8 deletions(-) diff --git a/cloudbuild/vendors/topology.textproto b/cloudbuild/vendors/topology.textproto index db7e2318..e58d2b2f 100644 --- a/cloudbuild/vendors/topology.textproto +++ b/cloudbuild/vendors/topology.textproto @@ -25,12 +25,19 @@ nodes: { } } services: { - key: 6030 + key: 9339 value: { name: "gnmi" inside: 6030 } } + services: { + key: 9337 + value: { + name: "gnoi" + inside: 6030 + } + } services: { key: 9340 value: { diff --git a/cloudbuild/vendors/vendors_test.go b/cloudbuild/vendors/vendors_test.go index bdb26285..620c012b 100644 --- a/cloudbuild/vendors/vendors_test.go +++ b/cloudbuild/vendors/vendors_test.go @@ -69,7 +69,7 @@ func TestCEOS(t *testing.T) { dut := ondatra.DUT(t, "ceos") testGNMI(t, dut) testGRIBI(t, dut) - // testGNOI(t, dut) + testGNOI(t, dut) // testP4RT(t, dut) } diff --git a/examples/arista/ceos/ceos.pb.txt b/examples/arista/ceos/ceos.pb.txt index 656d57df..f19994d5 100644 --- a/examples/arista/ceos/ceos.pb.txt +++ b/examples/arista/ceos/ceos.pb.txt @@ -23,13 +23,27 @@ nodes: { inside: 22 } } - services:{ + services: { key: 6030 value: { name: "gnmi" inside: 6030 } } + services: { + key: 6031 + value: { + name: "gnoi" + inside: 6030 + } + } + services: { + key: 9340 + value: { + name: "gribi" + inside: 9340 + } + } } nodes: { name: "r2" @@ -55,6 +69,27 @@ nodes: { inside: 22 } } + services: { + key: 6030 + value: { + name: "gnmi" + inside: 6030 + } + } + services: { + key: 6031 + value: { + name: "gnoi" + inside: 6030 + } + } + services: { + key: 9340 + value: { + name: "gribi" + inside: 9340 + } + } } links: { a_node: "r1" diff --git a/examples/juniper/cptx-ixia/cptx-ixia.pb.txt b/examples/juniper/cptx-ixia/cptx-ixia.pb.txt index f6425429..98908a67 100644 --- a/examples/juniper/cptx-ixia/cptx-ixia.pb.txt +++ b/examples/juniper/cptx-ixia/cptx-ixia.pb.txt @@ -35,6 +35,7 @@ nodes: { config_path: "/home/evo/configdisk" config_file: "juniper.conf" file: "juniper.config" + image: "cptx:D33.12" cert: { self_signed: { cert_name: "grpc-server-cert", diff --git a/examples/multivendor/multivendor.pb.txt b/examples/multivendor/multivendor.pb.txt index d2468db4..7952ec6e 100644 --- a/examples/multivendor/multivendor.pb.txt +++ b/examples/multivendor/multivendor.pb.txt @@ -16,6 +16,27 @@ nodes: { } } } + services: { + key: 9339 + value: { + name: "gnmi" + inside: 6030 + } + } + services: { + key: 9337 + value: { + name: "gnoi" + inside: 6030 + } + } + services: { + key: 9340 + value: { + name: "gribi" + inside: 9340 + } + } } nodes: { name: "cptx" @@ -380,4 +401,4 @@ links: { a_int: "eth9" z_node: "cptx" z_int: "eth13" -} \ No newline at end of file +} diff --git a/go.mod b/go.mod index 1ba2d2a2..84f2cef7 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/openconfig/kne go 1.20 require ( - github.com/aristanetworks/arista-ceoslab-operator/v2 v2.0.1 + github.com/aristanetworks/arista-ceoslab-operator/v2 v2.0.2 github.com/docker/docker v20.10.24+incompatible github.com/ghodss/yaml v1.0.0 github.com/golang/glog v1.0.0 diff --git a/go.sum b/go.sum index fc624505..4803b803 100644 --- a/go.sum +++ b/go.sum @@ -397,8 +397,8 @@ github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VM github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/aristanetworks/arista-ceoslab-operator/v2 v2.0.1 h1:lOGhvrrxc/bzUMJI4kYmZh/N1a87Vnsk/TENZt5kCoc= -github.com/aristanetworks/arista-ceoslab-operator/v2 v2.0.1/go.mod h1:/mvSt2fEmlVEU7dppip3UNz/MUt380f50dFsZRGn83o= +github.com/aristanetworks/arista-ceoslab-operator/v2 v2.0.2 h1:KQL1evr4NM4ZQOLRs1bbmD0kYPmLRAMqvRrNSpYAph4= +github.com/aristanetworks/arista-ceoslab-operator/v2 v2.0.2/go.mod h1:/mvSt2fEmlVEU7dppip3UNz/MUt380f50dFsZRGn83o= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= diff --git a/manifests/controllers/ceoslab/manifest.yaml b/manifests/controllers/ceoslab/manifest.yaml index 8d1155c2..a673106a 100644 --- a/manifests/controllers/ceoslab/manifest.yaml +++ b/manifests/controllers/ceoslab/manifest.yaml @@ -487,7 +487,7 @@ spec: - --leader-elect command: - /manager - image: ghcr.io/aristanetworks/arista-ceoslab-operator:v2.0.1 + image: ghcr.io/aristanetworks/arista-ceoslab-operator:v2.0.2 livenessProbe: httpGet: path: /healthz From 8c3c7b42aefcba0d2c507267e606ba6e279762e7 Mon Sep 17 00:00:00 2001 From: Alex Masi Date: Fri, 5 May 2023 23:27:12 +0000 Subject: [PATCH 2/7] revert unintended changed file --- examples/juniper/cptx-ixia/cptx-ixia.pb.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/juniper/cptx-ixia/cptx-ixia.pb.txt b/examples/juniper/cptx-ixia/cptx-ixia.pb.txt index 98908a67..f6425429 100644 --- a/examples/juniper/cptx-ixia/cptx-ixia.pb.txt +++ b/examples/juniper/cptx-ixia/cptx-ixia.pb.txt @@ -35,7 +35,6 @@ nodes: { config_path: "/home/evo/configdisk" config_file: "juniper.conf" file: "juniper.config" - image: "cptx:D33.12" cert: { self_signed: { cert_name: "grpc-server-cert", From d32c914363bd403642e14dbb781646973d2208ba Mon Sep 17 00:00:00 2001 From: Alex Masi Date: Tue, 10 Oct 2023 20:55:03 +0000 Subject: [PATCH 3/7] fix merge issue --- examples/multivendor/multivendor.pb.txt | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/examples/multivendor/multivendor.pb.txt b/examples/multivendor/multivendor.pb.txt index 068dfc7a..13f1f9c6 100644 --- a/examples/multivendor/multivendor.pb.txt +++ b/examples/multivendor/multivendor.pb.txt @@ -16,27 +16,6 @@ nodes: { } } } - services: { - key: 9339 - value: { - name: "gnmi" - inside: 6030 - } - } - services: { - key: 9337 - value: { - name: "gnoi" - inside: 6030 - } - } - services: { - key: 9340 - value: { - name: "gribi" - inside: 9340 - } - } } nodes: { name: "cptx" From f89fcf7dca646c5c075a950fda3e995658f9b706 Mon Sep 17 00:00:00 2001 From: Alex Masi Date: Tue, 10 Oct 2023 21:20:12 +0000 Subject: [PATCH 4/7] disable kube file linting --- .github/workflows/go.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 5455136e..ff679f96 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -19,3 +19,5 @@ jobs: linter: uses: openconfig/common-ci/.github/workflows/linter.yml@c2294c3c86c90e75e58c24a40d6f7f3364bbae9d + env: + VALIDATE_KUBERNETES_KUBECONFORM: false From c3610dedf66f1701c7ea52290ba7190b5f72b2f8 Mon Sep 17 00:00:00 2001 From: Alex Masi Date: Tue, 10 Oct 2023 21:39:29 +0000 Subject: [PATCH 5/7] revert bad linter change --- .github/workflows/go.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index ff679f96..5455136e 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -19,5 +19,3 @@ jobs: linter: uses: openconfig/common-ci/.github/workflows/linter.yml@c2294c3c86c90e75e58c24a40d6f7f3364bbae9d - env: - VALIDATE_KUBERNETES_KUBECONFORM: false From 89e270f61a334dfd7be3a296d679ddcf1b7875eb Mon Sep 17 00:00:00 2001 From: Alex Masi Date: Tue, 10 Oct 2023 22:08:39 +0000 Subject: [PATCH 6/7] new linter --- .github/workflows/go.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 5455136e..bff3fd9d 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -9,7 +9,7 @@ on: jobs: go: - uses: openconfig/common-ci/.github/workflows/go.yml@c2294c3c86c90e75e58c24a40d6f7f3364bbae9d + uses: openconfig/common-ci/.github/workflows/go.yml@2c607974651ad33772bdfe74b282e64b1fd748e8 with: coverage-excludes-regex: /cloudbuild tests-excludes-regex: /cloudbuild @@ -18,4 +18,4 @@ jobs: go-versions: "['1.20']" linter: - uses: openconfig/common-ci/.github/workflows/linter.yml@c2294c3c86c90e75e58c24a40d6f7f3364bbae9d + uses: openconfig/common-ci/.github/workflows/linter.yml@2c607974651ad33772bdfe74b282e64b1fd748e8 From 1bbb7d00c5c92c5faddf58782c9947787c9b46e2 Mon Sep 17 00:00:00 2001 From: Alex Masi Date: Tue, 10 Oct 2023 22:25:57 +0000 Subject: [PATCH 7/7] new linter --- .github/workflows/go.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index bff3fd9d..d05cfd30 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -9,7 +9,7 @@ on: jobs: go: - uses: openconfig/common-ci/.github/workflows/go.yml@2c607974651ad33772bdfe74b282e64b1fd748e8 + uses: openconfig/common-ci/.github/workflows/go.yml@4a4b0744a11f707b838317e8f8788ca270873b30 with: coverage-excludes-regex: /cloudbuild tests-excludes-regex: /cloudbuild @@ -18,4 +18,4 @@ jobs: go-versions: "['1.20']" linter: - uses: openconfig/common-ci/.github/workflows/linter.yml@2c607974651ad33772bdfe74b282e64b1fd748e8 + uses: openconfig/common-ci/.github/workflows/linter.yml@4a4b0744a11f707b838317e8f8788ca270873b30