From 527eeb1964a38ec8f4f83e691fd36c818cfc4e14 Mon Sep 17 00:00:00 2001 From: Murilo Silva Date: Fri, 1 Mar 2024 12:14:29 -0300 Subject: [PATCH 1/4] add k8s logs --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index c58b764..0967af3 100644 --- a/Makefile +++ b/Makefile @@ -22,5 +22,8 @@ helm-install: helm-uninstall: @helm uninstall -n riab iqos-xapp +k8s-logs: + @kubectl logs -n riab $$(kubectl get pods -n riab --no-headers -o custom-columns=":metadata.name" | grep qmai) qmai -f + clean: ## Remove all the build artifacts rm -rf ./build/_output \ No newline at end of file From b8d5825fbe6d68134b23a7c08eac93a9a0a279ce Mon Sep 17 00:00:00 2001 From: Murilo Silva Date: Fri, 1 Mar 2024 12:18:39 -0300 Subject: [PATCH 2/4] fixes --- Makefile | 2 +- cmd/iqos-xapp/iqos-xapp.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 0967af3..77f4992 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ helm-uninstall: @helm uninstall -n riab iqos-xapp k8s-logs: - @kubectl logs -n riab $$(kubectl get pods -n riab --no-headers -o custom-columns=":metadata.name" | grep qmai) qmai -f + @kubectl logs -n riab $$(kubectl get pods -n riab --no-headers -o custom-columns=":metadata.name" | grep iqos-xapp) iqos-xapp -f clean: ## Remove all the build artifacts rm -rf ./build/_output \ No newline at end of file diff --git a/cmd/iqos-xapp/iqos-xapp.go b/cmd/iqos-xapp/iqos-xapp.go index 235cc46..f0f25fa 100644 --- a/cmd/iqos-xapp/iqos-xapp.go +++ b/cmd/iqos-xapp/iqos-xapp.go @@ -21,15 +21,15 @@ func main() { // set manager configuration cfg := manager.Config{ - AppID: "qmai", - CAPath: "/etc/qmai/certs/tls.cacrt", - KeyPath: "/etc/qmai/certs/tls.key", - CertPath: "/etc/qmai/certs/tls.crt", + AppID: "iqos-xapp", + CAPath: "/etc/iqos-xapp/certs/tls.cacrt", + KeyPath: "/etc/iqos-xapp/certs/tls.key", + CertPath: "/etc/iqos-xapp/certs/tls.crt", E2tEndpoint: "onos-e2t", E2tPort: 5150, TopoEndpoint: "onos-topo", TopoPort: 5150, - ConfigPath: "/etc/qmai/config/config.json", + ConfigPath: "/etc/iqos-xapp/config/config.json", KpmSM: manager.KpmSM{ Name: "oran-e2sm-kpm", Version: "v2", From 8cabd271910b27f25fabddf3ecd45803240cdda2 Mon Sep 17 00:00:00 2001 From: Murilo Silva Date: Fri, 1 Mar 2024 12:21:43 -0300 Subject: [PATCH 3/4] add Makefile help msgs --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 77f4992..4fca7c8 100644 --- a/Makefile +++ b/Makefile @@ -16,13 +16,13 @@ docker-build: ## Build the iqos-xapp docker image docker-push: docker-build ## Push image to Docker Hub @docker image push ${IQOS_DOCKER_REPO}:${IQOS_VERSION} -helm-install: +helm-install: ## Install iqos-xapp on Kubernetes @helm upgrade --install -n riab iqos-xapp ./deploy/helm-chart/iqos-chart -helm-uninstall: +helm-uninstall: ## Uninstall iqos-xapp on Kubernetes @helm uninstall -n riab iqos-xapp -k8s-logs: +k8s-logs: ## Gets logs from iqos-xapp pod @kubectl logs -n riab $$(kubectl get pods -n riab --no-headers -o custom-columns=":metadata.name" | grep iqos-xapp) iqos-xapp -f clean: ## Remove all the build artifacts From 062010e713df01b1351b99eaf6a24ba8184b2d5e Mon Sep 17 00:00:00 2001 From: Murilo Silva Date: Fri, 1 Mar 2024 12:57:39 -0300 Subject: [PATCH 4/4] change folder name --- {deploy => deploys}/helm-chart/README.MD | 0 {deploy => deploys}/helm-chart/TODO | 0 {deploy => deploys}/helm-chart/iqos-chart/.helmignore | 0 {deploy => deploys}/helm-chart/iqos-chart/Chart.yaml | 0 {deploy => deploys}/helm-chart/iqos-chart/templates/NOTES.txt | 0 {deploy => deploys}/helm-chart/iqos-chart/templates/_helpers.tpl | 0 {deploy => deploys}/helm-chart/iqos-chart/templates/hpa.yaml | 0 {deploy => deploys}/helm-chart/iqos-chart/templates/ingress.yaml | 0 {deploy => deploys}/helm-chart/iqos-chart/templates/service.yaml | 0 .../helm-chart/iqos-chart/templates/serviceaccount.yaml | 0 .../helm-chart/iqos-chart/templates/statefulset.yaml | 0 {deploy => deploys}/helm-chart/iqos-chart/values.yaml | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename {deploy => deploys}/helm-chart/README.MD (100%) rename {deploy => deploys}/helm-chart/TODO (100%) rename {deploy => deploys}/helm-chart/iqos-chart/.helmignore (100%) rename {deploy => deploys}/helm-chart/iqos-chart/Chart.yaml (100%) rename {deploy => deploys}/helm-chart/iqos-chart/templates/NOTES.txt (100%) rename {deploy => deploys}/helm-chart/iqos-chart/templates/_helpers.tpl (100%) rename {deploy => deploys}/helm-chart/iqos-chart/templates/hpa.yaml (100%) rename {deploy => deploys}/helm-chart/iqos-chart/templates/ingress.yaml (100%) rename {deploy => deploys}/helm-chart/iqos-chart/templates/service.yaml (100%) rename {deploy => deploys}/helm-chart/iqos-chart/templates/serviceaccount.yaml (100%) rename {deploy => deploys}/helm-chart/iqos-chart/templates/statefulset.yaml (100%) rename {deploy => deploys}/helm-chart/iqos-chart/values.yaml (100%) diff --git a/deploy/helm-chart/README.MD b/deploys/helm-chart/README.MD similarity index 100% rename from deploy/helm-chart/README.MD rename to deploys/helm-chart/README.MD diff --git a/deploy/helm-chart/TODO b/deploys/helm-chart/TODO similarity index 100% rename from deploy/helm-chart/TODO rename to deploys/helm-chart/TODO diff --git a/deploy/helm-chart/iqos-chart/.helmignore b/deploys/helm-chart/iqos-chart/.helmignore similarity index 100% rename from deploy/helm-chart/iqos-chart/.helmignore rename to deploys/helm-chart/iqos-chart/.helmignore diff --git a/deploy/helm-chart/iqos-chart/Chart.yaml b/deploys/helm-chart/iqos-chart/Chart.yaml similarity index 100% rename from deploy/helm-chart/iqos-chart/Chart.yaml rename to deploys/helm-chart/iqos-chart/Chart.yaml diff --git a/deploy/helm-chart/iqos-chart/templates/NOTES.txt b/deploys/helm-chart/iqos-chart/templates/NOTES.txt similarity index 100% rename from deploy/helm-chart/iqos-chart/templates/NOTES.txt rename to deploys/helm-chart/iqos-chart/templates/NOTES.txt diff --git a/deploy/helm-chart/iqos-chart/templates/_helpers.tpl b/deploys/helm-chart/iqos-chart/templates/_helpers.tpl similarity index 100% rename from deploy/helm-chart/iqos-chart/templates/_helpers.tpl rename to deploys/helm-chart/iqos-chart/templates/_helpers.tpl diff --git a/deploy/helm-chart/iqos-chart/templates/hpa.yaml b/deploys/helm-chart/iqos-chart/templates/hpa.yaml similarity index 100% rename from deploy/helm-chart/iqos-chart/templates/hpa.yaml rename to deploys/helm-chart/iqos-chart/templates/hpa.yaml diff --git a/deploy/helm-chart/iqos-chart/templates/ingress.yaml b/deploys/helm-chart/iqos-chart/templates/ingress.yaml similarity index 100% rename from deploy/helm-chart/iqos-chart/templates/ingress.yaml rename to deploys/helm-chart/iqos-chart/templates/ingress.yaml diff --git a/deploy/helm-chart/iqos-chart/templates/service.yaml b/deploys/helm-chart/iqos-chart/templates/service.yaml similarity index 100% rename from deploy/helm-chart/iqos-chart/templates/service.yaml rename to deploys/helm-chart/iqos-chart/templates/service.yaml diff --git a/deploy/helm-chart/iqos-chart/templates/serviceaccount.yaml b/deploys/helm-chart/iqos-chart/templates/serviceaccount.yaml similarity index 100% rename from deploy/helm-chart/iqos-chart/templates/serviceaccount.yaml rename to deploys/helm-chart/iqos-chart/templates/serviceaccount.yaml diff --git a/deploy/helm-chart/iqos-chart/templates/statefulset.yaml b/deploys/helm-chart/iqos-chart/templates/statefulset.yaml similarity index 100% rename from deploy/helm-chart/iqos-chart/templates/statefulset.yaml rename to deploys/helm-chart/iqos-chart/templates/statefulset.yaml diff --git a/deploy/helm-chart/iqos-chart/values.yaml b/deploys/helm-chart/iqos-chart/values.yaml similarity index 100% rename from deploy/helm-chart/iqos-chart/values.yaml rename to deploys/helm-chart/iqos-chart/values.yaml