Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Vici from Easy2Use bundles #89

Merged
merged 1 commit into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
bash remrem_publish_event.bash -d $DOMAIN -n $NAMESPACE

: # Wait for a while until the processing of the events
echo "Waiting..." && sleep 60
echo "Waiting..." && sleep 90
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have any to check this instead of doing a sleep?

Copy link
Contributor Author

@pef-ericsson pef-ericsson May 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, we give some time to the Eiffel events process and the Jenkins jobs to be executed. A minute is not enough always, so I increased it to 1.5 min.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't question that we have to wait I was wondering if we could poll the Jenkins jobs or something that knows when the task is ready instead of just doing a sleep and hope that it will finish in time.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We check if the Jenkins jobs are done in the next pipeline step "Ensure that Jenkins jobs executed successfully".


- name: Ensure that Jenkins jobs executed successfully
run: |
Expand Down
1 change: 0 additions & 1 deletion bundles/Cx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ Dependent Components Included from Eiffel Bundle
- RemRem Generate
- RemRem Publish
- Event Repository REST API
- Eiffel-Vici
- Eiffel Intelligence artifact

Usage
Expand Down
2 changes: 1 addition & 1 deletion bundles/Cx/config-bundle.bash
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export CX_JENKINS_CONFIG_SECRETS_PATH=charts/charts_values/jenkins_secrets/
# - OBS no spaces allowed!!
#

CONF_Cx_DEPENDENCIES_BUNDLES[0]="Eiffel,rabbitmq,mongodb,mongo_seed,remrem_generate,remrem_publish,er,ei_backend_artifact,ei_frontend,vici,dummy_er"
CONF_Cx_DEPENDENCIES_BUNDLES[0]="Eiffel,rabbitmq,mongodb,mongo_seed,remrem_generate,remrem_publish,er,ei_backend_artifact,ei_frontend,dummy_er"

# ------------------------------

155 changes: 0 additions & 155 deletions bundles/Eiffel/K8S/charts/charts_values/eiffel-vici-values.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions bundles/Eiffel/K8S/cleaner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ kubectl delete pod --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_R
kubectl delete pod --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_NEXUS3"-0
kubectl delete pod --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_REMREM_GENERATE"-0
kubectl delete pod --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_REMREM_PUBLISH"-0
kubectl delete pod --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_VICI"-0
kubectl delete pod --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_VE"-0
kubectl delete pod --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_EI_FRONTEND"-0
kubectl delete pod --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_EI_BACKEND_ALLEVENTS"-0
Expand All @@ -43,7 +42,6 @@ kubectl delete statefulset --grace-period=0 --force --namespace "$K8S_NAMESPACE"
kubectl delete statefulset --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_NEXUS3_CONFIG"
kubectl delete statefulset --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_REMREM_GENERATE"
kubectl delete statefulset --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_REMREM_PUBLISH"
kubectl delete statefulset --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_VICI"
kubectl delete statefulset --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_VE"
kubectl delete statefulset --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_EI_FRONTEND"
kubectl delete statefulset --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_EI_BACKEND_ALLEVENTS"
Expand Down
18 changes: 0 additions & 18 deletions bundles/Eiffel/K8S/k8s_bundle_functions.bash
Original file line number Diff line number Diff line change
Expand Up @@ -194,24 +194,6 @@ function execute_k8s_command_on_services {
local chart="charts/eiffel-2.0.0.tgz"
;;

vici)
local releasename="$K8S_RELEASE_EIFFEL_VICI"
local settings=(
image.registry="$EXTERNAL_DOCKER_REGISTRY"
image.repository="$EIFFEL_VICI_IMAGE_TAG_NAME"
image.tag="$EIFFEL_VICI_VERSION"
ingress.hostName="$K8S_INGRESS_EIFFEL_VICI"
ingress.tls="$K8S_INGRESS_TLS_ENABLE"
ingress.tlsSecret="$K8S_INGRESS_CERT_SECRET_NAME"
ingress.enabled="$K8S_Ingress_Enabled"
fullnameOverride="$K8S_RELEASE_EIFFEL_VICI"
eiffel.servicePort="$EIFFEL_VICI_EXTERNAL_PORT"
eiffel.containerPort="$EIFFEL_VICI_INTERNAL_PORT"
)
local valuefile="charts/charts_values/eiffel-vici-values.yaml"
local chart="charts/eiffel-2.0.0.tgz"
;;

remrem_publish)
local releasename="$K8S_RELEASE_EIFFEL_REMREM_PUBLISH"
local settings=(
Expand Down
2 changes: 1 addition & 1 deletion bundles/Eiffel/K8S/packages/max.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
##
##--------------------------------------------------------------------------------------

k8s_package_services="mongodb mongo_seed rabbitmq ei_backend_artifact ei_backend_sourcechange ei_backend_testexecution ei_backend_allevents ei_frontend vici dummy_er remrem_generate remrem_publish er jenkins jenkins_fem nexus"
k8s_package_services="mongodb mongo_seed rabbitmq ei_backend_artifact ei_backend_sourcechange ei_backend_testexecution ei_backend_allevents ei_frontend dummy_er remrem_generate remrem_publish er jenkins jenkins_fem nexus"
1 change: 0 additions & 1 deletion bundles/Eiffel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ Components included in Eiffel bundle
- Eiffel Jenkins (with Fem Plugin)
- Jenkins
- Event Repository REST API
- Vici
- Dummy Event Repository REST API
- Nexus3

Expand Down
4 changes: 0 additions & 4 deletions bundles/Eiffel/base-config.bash
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ export EIFFEL_JENKINS="eiffel-jenkins"
export EIFFEL_NEXUS3="eiffel-nexus3"
export EIFFEL_REMREM_GENERATE="eiffel-remrem-generate"
export EIFFEL_REMREM_PUBLISH="eiffel-remrem-publish"
export EIFFEL_VICI="eiffel-vici"
export EIFFEL_EI_BACKEND_ARTIFACT="eiffel-backend-artifact"
export EIFFEL_EI_BACKEND_SOURCECHANGE="eiffel-backend-sourcechange"
export EIFFEL_EI_BACKEND_TESTEXECUTION="eiffel-backend-testexecution"
Expand Down Expand Up @@ -70,9 +69,6 @@ export EIFFEL_REMREM_GENERATE_INTERNAL_PORT=8080
export EIFFEL_REMREM_PUBLISH_EXTERNAL_PORT=8096
export EIFFEL_REMREM_PUBLISH_INTERNAL_PORT=8080

export EIFFEL_VICI_EXTERNAL_PORT=8092
export EIFFEL_VICI_INTERNAL_PORT=8080

export EIFFEL_EI_BACKEND_ARTIFACT_EXTERNAL_PORT=8070
export EIFFEL_EI_BACKEND_ARTIFACT_INTERNAL_PORT=8080

Expand Down
3 changes: 0 additions & 3 deletions bundles/Eiffel/component-versions.bash
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export EIFFEL_MONGODB_VERSION=4.4.1
export EIFFEL_RABBITMQ_VERSION=3.8.9
export EIFFEL_EI_BACKEND_VERSION=3.0.0
export EIFFEL_EI_FRONTEND_VERSION=3.0.0
export EIFFEL_VICI_VERSION=0.0.1
export EIFFEL_DUMMY_ER_VERSION=latest
export EIFFEL_ER_VERSION=2.0.36
export EIFFEL_REMREM_GENERATE_VERSION=2.0.17
Expand All @@ -38,7 +37,6 @@ export EIFFEL_MONGODB_IMAGE_TAG_NAME=bitnami/mongodb
export EIFFEL_RABBITMQ_IMAGE_TAG_NAME=bitnami/rabbitmq
export EIFFEL_EI_BACKEND_IMAGE_TAG_NAME=eiffelericsson/eiffel-intelligence-backend
export EIFFEL_EI_FRONTEND_IMAGE_TAG_NAME=eiffelericsson/eiffel-intelligence-frontend
export EIFFEL_VICI_IMAGE_TAG_NAME=eiffelericsson/eiffel-vici
export EIFFEL_DUMMY_ER_IMAGE_TAG_NAME=eiffelericsson/dummy-er
export EIFFEL_ER_IMAGE_TAG_NAME=eiffelericsson/eiffel-er
export EIFFEL_REMREM_GENERATE_IMAGE_TAG_NAME=eiffelericsson/eiffel-remrem-generate
Expand All @@ -53,7 +51,6 @@ export EIFFEL_MONGODB_IMAGE_TAG=${EIFFEL_MONGODB_IMAGE_TAG_NAME}:${EIFFEL_MONGOD
export EIFFEL_RABBITMQ_IMAGE_TAG=${EIFFEL_RABBITMQ_IMAGE_TAG_NAME}:${EIFFEL_RABBITMQ_VERSION}
export EIFFEL_EI_BACKEND_IMAGE_TAG=${EXTERNAL_DOCKER_REGISTRY}/${EIFFEL_EI_BACKEND_IMAGE_TAG_NAME}:${EIFFEL_EI_BACKEND_VERSION}
export EIFFEL_EI_FRONTEND_IMAGE_TAG=${EXTERNAL_DOCKER_REGISTRY}/${EIFFEL_EI_FRONTEND_IMAGE_TAG_NAME}:${EIFFEL_EI_FRONTEND_VERSION}
export EIFFEL_VICI_IMAGE_TAG=${EXTERNAL_DOCKER_REGISTRY}/${EIFFEL_VICI_IMAGE_TAG_NAME}:${EIFFEL_VICI_VERSION}
export EIFFEL_DUMMY_ER_IMAGE_TAG=${EXTERNAL_DOCKER_REGISTRY}/${EIFFEL_DUMMY_ER_IMAGE_TAG_NAME}:${EIFFEL_DUMMY_ER_VERSION}
export EIFFEL_ER_IMAGE_TAG=${EXTERNAL_DOCKER_REGISTRY}/${EIFFEL_ER_IMAGE_TAG_NAME}:${EIFFEL_ER_VERSION}
export EIFFEL_REMREM_GENERATE_IMAGE_TAG=${EXTERNAL_DOCKER_REGISTRY}/${EIFFEL_REMREM_GENERATE_IMAGE_TAG_NAME}:${EIFFEL_REMREM_GENERATE_VERSION}
Expand Down
1 change: 0 additions & 1 deletion bundles/Eiffel/docker-base-config.bash
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export EIFFEL_JENKINS_APPLICATION_PORT=${EIFFEL_JENKINS_INTERNAL_PORT}
export EIFFEL_NEXUS_APPLICATION_PORT=${EIFFEL_NEXUS_INTERNAL_PORT}
export EIFFEL_REMREM_GENERATE_APPLICATION_PORT=${EIFFEL_REMREM_GENERATE_INTERNAL_PORT}
export EIFFEL_REMREM_PUBLISH_APPLICATION_PORT=${EIFFEL_REMREM_PUBLISH_INTERNAL_PORT}
export EIFFEL_VICI_APPLICATION_PORT=${EIFFEL_VICI_INTERNAL_PORT}
export EIFFEL_EI_BACKEND_ARTIFACT_APPLICATION_PORT=${EIFFEL_EI_BACKEND_ARTIFACT_INTERNAL_PORT}
export EIFFEL_EI_BACKEND_SOURCECHANGE_APPLICATION_PORT=${EIFFEL_EI_BACKEND_SOURCECHANGE_INTERNAL_PORT}
export EIFFEL_EI_BACKEND_TESTEXECUTION_APPLICATION_PORT=${EIFFEL_EI_BACKEND_TESTEXECUTION_INTERNAL_PORT}
Expand Down
17 changes: 1 addition & 16 deletions bundles/Eiffel/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ services:


####### /Start Eiffel Intelligence Frontend ###############################################################################

ei_frontend:
restart: always
image: ${EIFFEL_EI_FRONTEND_IMAGE_TAG}
Expand All @@ -246,21 +247,6 @@ services:

####### /Stop Eiffel Intelligence Frontend ###############################################################################

vici:
restart: always
image: ${EIFFEL_VICI_IMAGE_TAG}
expose:
- "${EIFFEL_VICI_INTERNAL_PORT}"
ports:
- "${EIFFEL_VICI_EXTERNAL_PORT}:${EIFFEL_VICI_INTERNAL_PORT}"
# environment:
# - WAIT_MB_HOSTS=rabbitmq:15672
# - WAIT_DB_HOSTS=mongodb:27017
networks:
eiffel.0_1:
aliases:
- ${EIFFEL_VICI}

dummy_er:
restart: always
image: ${EIFFEL_DUMMY_ER_IMAGE_TAG}
Expand All @@ -270,7 +256,6 @@ services:
- "${EIFFEL_DUMMY_ER_EXTERNAL_PORT}:${EIFFEL_DUMMY_ER_INTERNAL_PORT}"
depends_on:
- er
- vici
networks:
eiffel.0_1:
aliases:
Expand Down
2 changes: 1 addition & 1 deletion bundles/Eiffel/docker-compose/packages/max.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
##
##--------------------------------------------------------------------------------------

docker_package_services="mongodb mongo_seed rabbitmq ei_backend_artifact ei_backend_sourcechange ei_backend_testexecution ei_backend_allevents ei_frontend vici dummy_er remrem_generate remrem_publish er jenkins jenkins_fem nexus"
docker_package_services="mongodb mongo_seed rabbitmq ei_backend_artifact ei_backend_sourcechange ei_backend_testexecution ei_backend_allevents ei_frontend dummy_er remrem_generate remrem_publish er jenkins jenkins_fem nexus"
7 changes: 0 additions & 7 deletions bundles/Eiffel/k8s-base-config.bash
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ export K8S_RELEASE_EIFFEL_EI_BACKEND_SOURCECHANGE=$EIFFEL_EI_BACKEND_SOURCECHANG
export K8S_RELEASE_EIFFEL_EI_BACKEND_TESTEXECUTION=$EIFFEL_EI_BACKEND_TESTEXECUTION-${K8S_NAMESPACE}
export K8S_RELEASE_EIFFEL_EI_BACKEND_ALLEVENTS=$EIFFEL_EI_BACKEND_ALLEVENTS-${K8S_NAMESPACE}
export K8S_RELEASE_EIFFEL_DUMMY_ER=$EIFFEL_DUMMY_ER-${K8S_NAMESPACE}
export K8S_RELEASE_EIFFEL_VICI=$EIFFEL_VICI-${K8S_NAMESPACE}
export K8S_RELEASE_EIFFEL_REMREM_GENERATE=$EIFFEL_REMREM_GENERATE-${K8S_NAMESPACE}
export K8S_RELEASE_EIFFEL_REMREM_PUBLISH=$EIFFEL_REMREM_PUBLISH-${K8S_NAMESPACE}
export K8S_RELEASE_EIFFEL_ER=$EIFFEL_ER-${K8S_NAMESPACE}
Expand All @@ -66,7 +65,6 @@ export K8S_INGRESS_EIFFEL_JENKINS=$K8S_RELEASE_EIFFEL_JENKINS.$K8S_DOMAINNAME
export K8S_INGRESS_EIFFEL_NEXUS3=$K8S_RELEASE_EIFFEL_NEXUS3.$K8S_DOMAINNAME
export K8S_INGRESS_EIFFEL_REMREM_GENERATE=$K8S_RELEASE_EIFFEL_REMREM_GENERATE.$K8S_DOMAINNAME
export K8S_INGRESS_EIFFEL_REMREM_PUBLISH=$K8S_RELEASE_EIFFEL_REMREM_PUBLISH.$K8S_DOMAINNAME
export K8S_INGRESS_EIFFEL_VICI=$K8S_RELEASE_EIFFEL_VICI.$K8S_DOMAINNAME
export K8S_INGRESS_EIFFEL_EI_BACKEND_ALLEVENTS=$K8S_RELEASE_EIFFEL_EI_BACKEND_ALLEVENTS.$K8S_DOMAINNAME
export K8S_INGRESS_EIFFEL_EI_BACKEND_ARTIFACT=$K8S_RELEASE_EIFFEL_EI_BACKEND_ARTIFACT.$K8S_DOMAINNAME
export K8S_INGRESS_EIFFEL_EI_BACKEND_SOURCECHANGE=$K8S_RELEASE_EIFFEL_EI_BACKEND_SOURCECHANGE.$K8S_DOMAINNAME
Expand All @@ -85,7 +83,6 @@ export EIFFEL_JENKINS=$K8S_RELEASE_EIFFEL_JENKINS
export EIFFEL_NEXUS3=$K8S_RELEASE_EIFFEL_NEXUS3
export EIFFEL_REMREM_GENERATE=$K8S_RELEASE_EIFFEL_REMREM_GENERATE
export EIFFEL_REMREM_PUBLISH=$K8S_RELEASE_EIFFEL_REMREM_PUBLISH
export EIFFEL_VICI=$K8S_RELEASE_EIFFEL_VICI
export EIFFEL_EI_BACKEND_ARTIFACT=$K8S_RELEASE_EIFFEL_EI_BACKEND_ARTIFACT
export EIFFEL_EI_BACKEND_SOURCECHANGE=$K8S_RELEASE_EIFFEL_EI_BACKEND_SOURCECHANGE
export EIFFEL_EI_BACKEND_TESTEXECUTION=$K8S_RELEASE_EIFFEL_EI_BACKEND_TESTEXECUTION
Expand All @@ -104,13 +101,9 @@ export EIFFEL_JENKINS_APPLICATION_PORT=${EIFFEL_JENKINS_EXTERNAL_PORT}
export EIFFEL_NEXUS_APPLICATION_PORT=${EIFFEL_NEXUS_EXTERNAL_PORT}
export EIFFEL_REMREM_GENERATE_APPLICATION_PORT=${EIFFEL_REMREM_GENERATE_EXTERNAL_PORT}
export EIFFEL_REMREM_PUBLISH_APPLICATION_PORT=${EIFFEL_REMREM_PUBLISH_EXTERNAL_PORT}
export EIFFEL_VICI_APPLICATION_PORT=${EIFFEL_VICI_EXTERNAL_PORT}
export EIFFEL_EI_BACKEND_ARTIFACT_APPLICATION_PORT=${EIFFEL_EI_BACKEND_ARTIFACT_EXTERNAL_PORT}
export EIFFEL_EI_BACKEND_SOURCECHANGE_APPLICATION_PORT=${EIFFEL_EI_BACKEND_SOURCECHANGE_EXTERNAL_PORT}
export EIFFEL_EI_BACKEND_TESTEXECUTION_APPLICATION_PORT=${EIFFEL_EI_BACKEND_TESTEXECUTION_EXTERNAL_PORT}
export EIFFEL_EI_BACKEND_ALLEVENTS_APPLICATION_PORT=${EIFFEL_EI_BACKEND_ALLEVENTS_EXTERNAL_PORT}
export EIFFEL_EI_FRONTEND_APPLICATION_PORT=${EIFFEL_EI_FRONTEND_EXTERNAL_PORT}
export EIFFEL_EI_FRONTEND_EXTERNAL_APPLICATION_PORT=443



1 change: 0 additions & 1 deletion bundles/GitLab/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ Dependent Components Included from Eiffel2 Bundle
- RemRem Publish
- Nexus3
- Event Repository REST API
- Eiffel-Vici
- Eiffel Intelligence artifact

Usage
Expand Down
2 changes: 1 addition & 1 deletion bundles/GitLab/config-bundle.bash
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export GITLAB_GITLAB="gitlab-gitlab"
# - OBS no spaces allowed!!
#

CONF_GitLab_DEPENDENCIES_BUNDLES[0]="Eiffel,rabbitmq,mongodb,mongo_seed,remrem_generate,remrem_publish,er,vici,dummy_er,nexus"
CONF_GitLab_DEPENDENCIES_BUNDLES[0]="Eiffel,rabbitmq,mongodb,mongo_seed,remrem_generate,remrem_publish,er,dummy_er,nexus"

# ------------------------------

2 changes: 0 additions & 2 deletions wiki/cx/components.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,3 @@ MongoDB & Data Seeding | mongodb<br> mongo_seed | N/A | N/A | The seed-data fold
RemRem Generate | remrem_generate | N/A | eiffel-remrem-generate-\<namespace\>.\<domainname\>
RemRem Publish | remrem_publish | N/A | eiffel-remrem-publish-\<namespace\>.\<domainname\>
Event Repository REST API | er | N/A | eiffel-er-\<namespace\>.\<domainname\>
Eiffel Vici | vici | N/A | eiffel-vici-\<namespace\>.\<domainname\>

1 change: 0 additions & 1 deletion wiki/cx/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ Dependent Components Included from Eiffel Bundle
- RemRem Generate
- RemRem Publish
- Event Repository REST API
- Eiffel ViCi
- Eiffel Intelligence (with artifact rules)

A more detailed [view of the components can be found here](components.md).
Expand Down
Loading
Loading