change the container naming, add asapo-cluster

.gitlab-ci.yml

@@ -94,8 +94,9 @@ build-services-docker:
     - >
       for service in $services; do
           service_dir=${service//"-"/"_"}
-          IFS='' /kaniko/executor --cache=false --context $CI_PROJECT_DIR/build/${service_dir} --dockerfile $CI_PROJECT_DIR/build/${service_dir}/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-dev-${service}:${CI_COMMIT_SHORT_SHA} --build-arg "CI_REGISTRY_IMAGE='${CI_REGISTRY_IMAGE}'"
+          /kaniko/executor --cache=false --context $CI_PROJECT_DIR/build/${service_dir} --dockerfile $CI_PROJECT_DIR/build/${service_dir}/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-${service}-dev:${CI_COMMIT_SHORT_SHA}
       done
+    - /kaniko/executor --cache=false --context $CI_PROJECT_DIR/build/deploy/asapo_services --dockerfile $CI_PROJECT_DIR/deploy/asapo_services/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-cluster-dev:${CI_COMMIT_SHORT_SHA} --destination $CI_REGISTRY_IMAGE/asapo-cluster-dev:latest
   tags:
     - kubernetes-executor
   rules:

CMakeIncludes/prepare_version_tag.cmake

@@ -26,6 +26,12 @@ if (DEFINED ENV{CI_COMMIT_REF_NAME})
     return ()
 endif ()
 
+if (DEFINED ENV{CI_REGISTRY_IMAGE})
+    SET(ASAPO_VERSION_DOCKER_REGISTRY $ENV{CI_REGISTRY_IMAGE})
+else ()
+    SET(ASAPO_VERSION_DOCKER_REGISTRY yakser)
+endif()
+
 execute_process(COMMAND git describe --tags --abbrev=0
         OUTPUT_VARIABLE ASAPO_TAG
         WORKING_DIRECTORY ..)

deploy/asapo_services/Dockerfile

-FROM yakser/asapo-nomad-cluster
-
+FROM debian:bullseye
 MAINTAINER DESY IT
 
-COPY scripts/ /var/run/asapo/
+RUN set -eux; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+		ca-certificates \
+		curl \
+		gnupg \
+	;
+
+RUN curl -fsSL https://apt.releases.hashicorp.com/gpg  | gpg --dearmor > /usr/share/keyrings/nomad-hashicorp-archive-keyring.gpg
+RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/nomad-hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com bullseye main" >> /etc/apt/sources.list
 
+RUN set -eux; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+		supervisor \
+		gnupg-agent \
+		dnsutils \
+		nomad \
+		consul \
+		terraform \
+		iproute2 \
+	; \
+	rm -rf /var/lib/apt/lists/*
+
+COPY scripts/ /var/run/asapo/
+COPY jobs-* /usr/bin/
 COPY asapo-wait-service  /usr/bin/
+COPY supervisord.conf /etc/
+COPY *.py  /etc/asapo/
+COPY *.hcl.tpl  /etc/asapo/
+
+RUN mkdir -p /var/log/supervisord/ /etc/consul.d /etc/nomad.d
+
+RUN cd /var/run/asapo && terraform init
+
+RUN chmod -R og+wrX /var /run /etc/consul.d /etc/nomad.d
+
+ENTRYPOINT ["supervisord", "--configuration", "/etc/supervisord.conf"]
 
-RUN cd /var/run/asapo asapo && terraform init

deploy/asapo_services/asap3.tfvars

 elk_logs = true
 perf_monitor = true
 
+asapo_image_registry = "yakser"
 asapo_imagename_suffix = ""
 asapo_image_tag = ""
 

deploy/asapo_services/scripts/asapo-brokers.nmd.tpl

@@ -29,7 +29,7 @@ job "asapo-brokers" {
         network_mode = "host"
 	    security_opt = ["no-new-privileges"]
 	    userns_mode = "host"
-        image = "yakser/asapo-broker${image_suffix}"
+        image = "${image_registry}/asapo-broker${image_suffix}"
 	    force_pull = ${force_pull_images}
         volumes = ["local/config.json:/var/lib/broker/config.json"]
         %{ if ! nomad_logs  }

deploy/asapo_services/scripts/asapo-fts.nmd.tpl

@@ -29,7 +29,7 @@ job "asapo-file-transfer" {
         network_mode = "host"
 	    security_opt = ["no-new-privileges"]
 	    userns_mode = "host"
-        image = "yakser/asapo-file-transfer${image_suffix}"
+        image = "${image_registry}/asapo-file-transfer${image_suffix}"
 	    force_pull = ${force_pull_images}
         volumes = ["local/config.json:/var/lib/file_transfer/config.json",
                            "${offline_dir}:${offline_dir}",

deploy/asapo_services/scripts/asapo-receivers.nmd.tpl

@@ -34,7 +34,7 @@ job "asapo-receivers" {
 	    security_opt = ["no-new-privileges"]
 	    userns_mode = "host"
 	    privileged = true
-        image = "yakser/asapo-receiver${image_suffix}"
+        image = "${image_registry}/asapo-receiver${image_suffix}"
 	    force_pull = ${force_pull_images}
         volumes = ["local/config.json:/var/lib/receiver/config.json",
                    "${offline_dir}:${offline_dir}",

deploy/asapo_services/scripts/asapo-services.nmd.tpl

@@ -18,7 +18,7 @@ job "asapo-services" {
         network_mode = "host"
 	    security_opt = ["no-new-privileges"]
 	    userns_mode = "host"
-        image = "yakser/asapo-authorizer${image_suffix}"
+        image = "${image_registry}/asapo-authorizer${image_suffix}"
 	    force_pull = ${force_pull_images}
         volumes = ["local/config.json:/var/lib/authorizer/config.json",
                            "${offline_dir}:${offline_dir}",
@@ -96,7 +96,7 @@ job "asapo-services" {
         network_mode = "host"
 	    security_opt = ["no-new-privileges"]
 	    userns_mode = "host"
-        image = "yakser/asapo-discovery${image_suffix}"
+        image = "${image_registry}/asapo-discovery${image_suffix}"
 	    force_pull = ${force_pull_images}
         volumes = ["local/config.json:/var/lib/discovery/config.json"]
         %{ if ! nomad_logs  }

deploy/asapo_services/scripts/asapo.auto.tfvars.in

+asapo_image_registry="@ASAPO_VERSION_DOCKER_REGISTRY@"
 asapo_imagename_suffix="@ASAPO_VERSION_DOCKER_SUFFIX@"
 asapo_image_tag = "@ASAPO_VERSION@"
 
@@ -27,6 +28,8 @@ receiver_dataserver_nthreads = 4
 receiver_receive_to_disk_threshold = 50 #mb
 receiver_network_modes = "tcp"
 receiver_expose_metrics = true
+receiver_kafka_enabled = false
+receiver_kafka_metadata_broker_list = ""
 
 grafana_total_memory_size = "256"
 

deploy/asapo_services/scripts/templates.tf

@@ -27,6 +27,7 @@ data "template_file" "asapo_services" {
     online_dir = "${var.online_dir}"
     offline_dir = "${var.offline_dir}"
     ldap_uri = "${var.ldap_uri}"
+    image_registry = "${var.asapo_image_registry}"
     image_suffix = "${var.asapo_imagename_suffix}:${var.asapo_image_tag}"
     nomad_logs = "${var.nomad_logs}"
     authorizer_total_memory_size = "${var.authorizer_total_memory_size}"
@@ -44,6 +45,7 @@ data "template_file" "asapo_receivers" {
     scripts_dir = "${var.job_scripts_dir}"
     online_dir = "${var.online_dir}"
     offline_dir = "${var.offline_dir}"
+    image_registry = "${var.asapo_image_registry}"
     image_suffix = "${var.asapo_imagename_suffix}:${var.asapo_image_tag}"
     nomad_logs = "${var.nomad_logs}"
     receiver_total_memory_size = "${var.receiver_total_memory_size}"
@@ -65,6 +67,7 @@ data "template_file" "asapo_brokers" {
   template = "${file("${var.job_scripts_dir}/asapo-brokers.nmd.tpl")}"
   vars = {
     scripts_dir = "${var.job_scripts_dir}"
+    image_registry = "${var.asapo_image_registry}"
     image_suffix = "${var.asapo_imagename_suffix}:${var.asapo_image_tag}"
     nomad_logs = "${var.nomad_logs}"
     asapo_user = "${var.asapo_user}"
@@ -81,6 +84,7 @@ data "template_file" "asapo_fts" {
     scripts_dir = "${var.job_scripts_dir}"
     online_dir = "${var.online_dir}"
     offline_dir = "${var.offline_dir}"
+    image_registry = "${var.asapo_image_registry}"
     image_suffix = "${var.asapo_imagename_suffix}:${var.asapo_image_tag}"
     nomad_logs = "${var.nomad_logs}"
     asapo_user = "${var.asapo_user}"

deploy/asapo_services/scripts/vars.tf

@@ -32,6 +32,8 @@ variable "prometheus_version" {}
 
 variable "alertmanager_version" {}
 
+variable "asapo_image_registry" {}
+
 variable "asapo_imagename_suffix" {}
 
 variable "asapo_image_tag" {}