From 16ea2405a99fd5e06b7f25e28b41a6600a7a923f Mon Sep 17 00:00:00 2001 From: Ashutosh Kumar Date: Thu, 19 Oct 2023 22:31:06 +0530 Subject: [PATCH] replace all references of ixia-c-operator with keng-operator --- cloudbuild/vendors/deployment.yaml | 2 +- deploy/deploy.go | 2 +- deploy/kne/kind-bridge-unlicensed.yaml | 36 ------------------- docs/create_topology.md | 2 +- go.mod | 2 +- go.sum | 4 +-- .../manifests/keysight/ixiatg-configmap.yaml | 18 +++++----- .../manifests/keysight/ixiatg-operator.yaml | 2 +- .../keysight/ixiatg-configmap-unlicensed.yaml | 27 -------------- manifests/keysight/ixiatg-operator.yaml | 2 +- pods/data_test.go | 16 ++++----- topo/node/keysight/keysight.go | 4 +-- 12 files changed, 27 insertions(+), 90 deletions(-) delete mode 100644 deploy/kne/kind-bridge-unlicensed.yaml delete mode 100644 manifests/keysight/ixiatg-configmap-unlicensed.yaml diff --git a/cloudbuild/vendors/deployment.yaml b/cloudbuild/vendors/deployment.yaml index bd77b774..a92b7342 100644 --- a/cloudbuild/vendors/deployment.yaml +++ b/cloudbuild/vendors/deployment.yaml @@ -26,7 +26,7 @@ controllers: - kind: IxiaTG spec: operator: ../../manifests/keysight/ixiatg-operator.yaml - configMap: ../../manifests/keysight/ixiatg-configmap-unlicensed.yaml + configMap: ../../manifests/keysight/ixiatg-configmap.yaml - kind: SRLinux spec: operator: ../../manifests/controllers/srlinux/manifest.yaml diff --git a/deploy/deploy.go b/deploy/deploy.go index 9d2ffea3..ab28df94 100644 --- a/deploy/deploy.go +++ b/deploy/deploy.go @@ -1250,7 +1250,7 @@ func (i *IxiaTGSpec) Deploy(ctx context.Context) error { } if i.ConfigMap == "" && i.ConfigMapData == nil { - log.Warningf("IxiaTG controller deployed without configmap, before creating a topology with ixia-c be sure to create a configmap following https://github.com/open-traffic-generator/ixia-c-operator#ixia-c-operator and apply it using 'kubectl apply -f ixiatg-configmap.yaml'") + log.Warningf("IxiaTG controller deployed without configmap, before creating a topology with ixia-c be sure to create a configmap following https://github.com/open-traffic-generator/keng-operator#keng-operator and apply it using 'kubectl apply -f ixiatg-configmap.yaml'") return nil } if i.ConfigMapData != nil { diff --git a/deploy/kne/kind-bridge-unlicensed.yaml b/deploy/kne/kind-bridge-unlicensed.yaml deleted file mode 100644 index b54cd3ba..00000000 --- a/deploy/kne/kind-bridge-unlicensed.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# kind-bridge.yaml cluster config file sets up a kind cluster where default PTP CNI plugin -# is swapped with the Bridge CNI plugin. -# Bridge CNI plugin is required by some Network OSes to operate. -cluster: - kind: Kind - spec: - name: kne - recycle: True - version: v0.17.0 - image: kindest/node:v1.26.0 - config: ../../manifests/kind/config.yaml - additionalManifests: - - ../../manifests/kind/bridge.yaml -ingress: - kind: MetalLB - spec: - manifest: ../../manifests/metallb/manifest.yaml - ip_count: 100 -cni: - kind: Meshnet - spec: - manifest: ../../manifests/meshnet/grpc/manifest.yaml -controllers: - - kind: IxiaTG - spec: - operator: ../../manifests/keysight/ixiatg-operator.yaml - configMap: ../../manifests/keysight/ixiatg-configmap-unlicensed.yaml - - kind: SRLinux - spec: - operator: ../../manifests/controllers/srlinux/manifest.yaml - - kind: CEOSLab - spec: - operator: ../../manifests/controllers/ceoslab/manifest.yaml - - kind: Lemming - spec: - operator: ../../manifests/controllers/lemming/manifest.yaml diff --git a/docs/create_topology.md b/docs/create_topology.md index e16803cd..8909b8eb 100644 --- a/docs/create_topology.md +++ b/docs/create_topology.md @@ -202,7 +202,7 @@ kubectl delete secret -n ixiatg-op-system license-server ``` See more on the -[Ixia-operator GitHub repo](https://github.com/open-traffic-generator/ixia-c-operator). +[keng-operator GitHub repo](https://github.com/open-traffic-generator/keng-operator). ### SR Linux Controller diff --git a/go.mod b/go.mod index 7686e4f0..bff52017 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/h-fam/errdiff v1.0.2 github.com/kr/pretty v0.3.1 github.com/networkop/meshnet-cni v0.3.1-0.20230525201116-d7c306c635cf - github.com/open-traffic-generator/ixia-c-operator v0.3.6 + github.com/open-traffic-generator/keng-operator v0.3.13 github.com/open-traffic-generator/snappi/gosnappi v0.11.14 github.com/openconfig/gnmi v0.10.0 github.com/openconfig/gribi v1.0.0 diff --git a/go.sum b/go.sum index b40d4e0d..86499c86 100644 --- a/go.sum +++ b/go.sum @@ -676,8 +676,8 @@ github.com/networkop/meshnet-cni v0.3.1-0.20230525201116-d7c306c635cf/go.mod h1: github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo/v2 v2.6.0 h1:9t9b9vRUbFq3C4qKFCGkVuq/fIHji802N1nrtkh1mNc= github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E= -github.com/open-traffic-generator/ixia-c-operator v0.3.6 h1:dablUs6FAToVDFaoIo2M+Z9UCa93KAwlj7HJqNwLwTQ= -github.com/open-traffic-generator/ixia-c-operator v0.3.6/go.mod h1:Q+ZXCinXxUKcnrJf5PJC1Q7JxUQc5ZPZA85jwVAqIRQ= +github.com/open-traffic-generator/keng-operator v0.3.13 h1:XTYbqKafrSPF55YxfbTU4x6OEvsslvWKxxEocN959AM= +github.com/open-traffic-generator/keng-operator v0.3.13/go.mod h1:+koaOnSyrJHdzxnaye+M6k+ZbszQlWI9u3tMxSpORNA= github.com/open-traffic-generator/snappi/gosnappi v0.11.14 h1:AuD13HqZldjtPWvDKaXVDRZ+32Aol5QJCepEqTiukqM= github.com/open-traffic-generator/snappi/gosnappi v0.11.14/go.mod h1:CRT6BypHa7NOrNlrjw3Crcs9f7eLC4S34ERvyyGIusY= github.com/openconfig/gnmi v0.0.0-20200414194230-1597cc0f2600/go.mod h1:M/EcuapNQgvzxo1DDXHK4tx3QpYM/uG4l591v33jG2A= diff --git a/load/testdata/manifests/keysight/ixiatg-configmap.yaml b/load/testdata/manifests/keysight/ixiatg-configmap.yaml index 9240e252..edffb7a9 100644 --- a/load/testdata/manifests/keysight/ixiatg-configmap.yaml +++ b/load/testdata/manifests/keysight/ixiatg-configmap.yaml @@ -10,28 +10,28 @@ data: "images": [ { "name": "controller", - "path": "ghcr.io/open-traffic-generator/licensed/ixia-c-controller", - "tag": "0.0.1-3807" + "path": "ghcr.io/open-traffic-generator/keng-controller", + "tag": "0.0.1-5308" }, { "name": "gnmi-server", - "path": "ghcr.io/open-traffic-generator/ixia-c-gnmi-server", - "tag": "1.10.14" + "path": "ghcr.io/open-traffic-generator/otg-gnmi-server", + "tag": "1.12.8" }, { "name": "traffic-engine", "path": "ghcr.io/open-traffic-generator/ixia-c-traffic-engine", - "tag": "1.6.0.30" + "tag": "1.6.0.85" }, { "name": "protocol-engine", - "path": "ghcr.io/open-traffic-generator/licensed/ixia-c-protocol-engine", - "tag": "1.00.0.271" + "path": "ghcr.io/open-traffic-generator/ixia-c-protocol-engine", + "tag": "1.00.0.331" }, { "name": "ixhw-server", - "path": "ghcr.io/open-traffic-generator/ixia-c-ixhw-server", - "tag": "0.10.7-8" + "path": "ghcr.io/open-traffic-generator/keng-layer23-hw-server", + "tag": "0.12.5-1" } ] } diff --git a/load/testdata/manifests/keysight/ixiatg-operator.yaml b/load/testdata/manifests/keysight/ixiatg-operator.yaml index 72962299..4935b8f4 100644 --- a/load/testdata/manifests/keysight/ixiatg-operator.yaml +++ b/load/testdata/manifests/keysight/ixiatg-operator.yaml @@ -387,7 +387,7 @@ spec: - --leader-elect command: - /manager - image: ghcr.io/open-traffic-generator/ixia-c-operator:0.3.1 + image: ghcr.io/open-traffic-generator/keng-operator:0.3.13 livenessProbe: httpGet: path: /healthz diff --git a/manifests/keysight/ixiatg-configmap-unlicensed.yaml b/manifests/keysight/ixiatg-configmap-unlicensed.yaml deleted file mode 100644 index c4279a83..00000000 --- a/manifests/keysight/ixiatg-configmap-unlicensed.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: ixiatg-release-config - namespace: ixiatg-op-system -data: - versions: | - { - "release": "0.0.1-9999", - "images": [ - { - "name": "controller", - "path": "ghcr.io/open-traffic-generator/keng-controller", - "tag": "0.0.1-5308" - }, - { - "name": "gnmi-server", - "path": "ghcr.io/open-traffic-generator/otg-gnmi-server", - "tag": "1.12.8" - }, - { - "name": "traffic-engine", - "path": "ghcr.io/open-traffic-generator/ixia-c-traffic-engine", - "tag": "1.6.0.85" - } - ] - } diff --git a/manifests/keysight/ixiatg-operator.yaml b/manifests/keysight/ixiatg-operator.yaml index 82c58973..4935b8f4 100644 --- a/manifests/keysight/ixiatg-operator.yaml +++ b/manifests/keysight/ixiatg-operator.yaml @@ -387,7 +387,7 @@ spec: - --leader-elect command: - /manager - image: ghcr.io/open-traffic-generator/keng-operator:0.3.12 + image: ghcr.io/open-traffic-generator/keng-operator:0.3.13 livenessProbe: httpGet: path: /healthz diff --git a/pods/data_test.go b/pods/data_test.go index 580f870c..1b686feb 100644 --- a/pods/data_test.go +++ b/pods/data_test.go @@ -2202,7 +2202,7 @@ var ( "command": [ "/manager" ], - "image": "ghcr.io/open-traffic-generator/ixia-c-operator:0.3.1", + "image": "ghcr.io/open-traffic-generator/keng-operator:0.3.13", "imagePullPolicy": "IfNotPresent", "livenessProbe": { "failureThreshold": 3, @@ -2411,7 +2411,7 @@ var ( "command": [ "/manager" ], - "image": "ghcr.io/open-traffic-generator/ixia-c-operator:0.3.1", + "image": "ghcr.io/open-traffic-generator/keng-operator:0.3.13", "imagePullPolicy": "IfNotPresent", "livenessProbe": { "failureThreshold": 3, @@ -2582,7 +2582,7 @@ var ( } }, { - "image": "ghcr.io/open-traffic-generator/ixia-c-operator:0.3.1", + "image": "ghcr.io/open-traffic-generator/keng-operator:0.3.13", "imageID": "", "lastState": {}, "name": "manager", @@ -2616,7 +2616,7 @@ var ( }, { Name: "manager", - Image: "ghcr.io/open-traffic-generator/ixia-c-operator:0.3.1", + Image: "ghcr.io/open-traffic-generator/keng-operator:0.3.13", Reason: "ContainerCreating", }, }, @@ -2981,7 +2981,7 @@ var ( "command": [ "/manager" ], - "image": "ghcr.io/open-traffic-generator/ixia-c-operator:0.3.1", + "image": "ghcr.io/open-traffic-generator/keng-operator:0.3.13", "imagePullPolicy": "IfNotPresent", "livenessProbe": { "failureThreshold": 3, @@ -3154,8 +3154,8 @@ var ( }, { "containerID": "containerd://2f69e4e109842b198534badca065147a6c64de6af15c652c98e909e4e7395d0c", - "image": "ghcr.io/open-traffic-generator/ixia-c-operator:0.3.1", - "imageID": "ghcr.io/open-traffic-generator/ixia-c-operator@sha256:157c99a77f89db86ba5074656c9b43b8edce828e863704b631e624cbfac7e813", + "image": "ghcr.io/open-traffic-generator/keng-operator:0.3.13", + "imageID": "ghcr.io/open-traffic-generator/keng-operator@sha256:30b629370b7aafafeecd7a9c2a4eabae2c3129a877a4d161d86070002ab6b2e2", "lastState": {}, "name": "manager", "ready": false, @@ -3194,7 +3194,7 @@ var ( }, { Name: "manager", - Image: "ghcr.io/open-traffic-generator/ixia-c-operator:0.3.1", + Image: "ghcr.io/open-traffic-generator/keng-operator:0.3.13", Ready: true, }, }, diff --git a/topo/node/keysight/keysight.go b/topo/node/keysight/keysight.go index 868313af..47b0fe28 100644 --- a/topo/node/keysight/keysight.go +++ b/topo/node/keysight/keysight.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - ixclient "github.com/open-traffic-generator/ixia-c-operator/api/clientset/v1beta1" - ixiatg "github.com/open-traffic-generator/ixia-c-operator/api/v1beta1" + ixclient "github.com/open-traffic-generator/keng-operator/api/clientset/v1beta1" + ixiatg "github.com/open-traffic-generator/keng-operator/api/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" log "k8s.io/klog/v2"