Commit e2f9eec9 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '18-kubernetes-installation-needs-to-include-cridge-component'... 

Merge branch '18-kubernetes-installation-needs-to-include-cridge-component' into '16-expose-all-configurable-parameters-during-kubernetes-deployment'

Resolve "Kubernetes installation needs to include CRIDGE component"

See merge request !28
parents 12f5f76e a6afd64d

ci-templates/build.yml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
  stage: build

  image: maven:3.9.5-ibm-semeru-17-focal

  script:

    - mvn deploy -s ci_settings.xml -DskipTests -Dversion=$APP_VERSION

    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION

  artifacts:

    paths:

      - target/

ci-templates/build_unprotected.yml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
  stage: build

  image: maven:3.9.5-ibm-semeru-17-focal

  script:

    - mvn install -s ci_settings.xml -DskipTests

    - mvn install -s ci_settings.xml

  artifacts:

    paths:

      - target/

compose/docker-compose.yaml.configure

+14 −9
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ services: 


  keycloak:

      container_name: keycloak

      image: jboss/keycloak:16.1.1

      image: quay.io/keycloak/keycloak:16.1.1

      restart: always

      profiles: ["dev", "prod"]

      environment:
@@ -86,7 +86,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.portal.api/

        dockerfile: Dockerfile        

    image: org.etsi.osl.portal.api:latest

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:develop

    environment:

      SPRING_APPLICATION_JSON: '{

        "origins": "http://localhost",
@@ -133,7 +133,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.mano/

        dockerfile: Dockerfile        

    image: org.etsi.osl.mano:latest

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:develop

    environment:

       SPRING_APPLICATION_JSON: '{

        "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
@@ -159,7 +159,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.bugzilla/

        dockerfile: Dockerfile        

    image: org.etsi.osl.bugzilla:latest

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:develop

    environment:

      SPRING_APPLICATION_JSON: '{

        "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
@@ -185,7 +185,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.tmf.api/

        dockerfile: Dockerfile      

    image: org.etsi.osl.tmf.api:latest

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:develop

    environment:

      SPRING_APPLICATION_JSON: '{

        "origins": "http://localhost",
@@ -208,6 +208,11 @@ services: 
        "kroki.serverurl" : "http://localhost/kroki",

        "server.forward-headers-strategy":"FRAMEWORK"  

      }'

    logging:

      driver: "json-file"

      options:

        max-size: "1g"

        max-file: "3"  

    volumes:

    - ./repo:/root

    ports:
@@ -226,7 +231,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.osom/

        dockerfile: Dockerfile      

    image: org.etsi.osl.osom:latest

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:develop

    environment:

      SPRING_APPLICATION_JSON: '{

        "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
@@ -252,7 +257,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.oas/

        dockerfile: Dockerfile      

    image: org.etsi.osl.oas:latest

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:develop

    environment:

      SPRING_APPLICATION_JSON: '{

        "origins": "http://localhost",
@@ -289,7 +294,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.cridge/

        dockerfile: Dockerfile      

    image: org.etsi.osl.cridge:latest

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:develop

    environment:

      SPRING_APPLICATION_JSON: '{

        "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
@@ -328,7 +333,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.centrallog.service/

        dockerfile: Dockerfile        

    image: org.etsi.osl.centrallog.service:latest

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:develop

    environment:

      SPRING_APPLICATION_JSON: '{

        "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",

kubernetes/helm/openslice/files/org.etsi.osl.cridge/kubeconfig.yaml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
apiVersion: v1

kind: Config

clusters:

- name: development-cluster

  cluster:

    certificate-authority: path/to/ca.crt # Path to certificate authority file

    server: https://123.45.67.89:6443 # Cluster API server address

contexts:

- name: dev-user@development-cluster

  context:

    cluster: development-cluster

    namespace: development # Default namespace

    user: dev-user

current-context: dev-user@development-cluster

users:

- name: dev-user

  user:

    client-certificate: path/to/cert.crt # Path to the client certificate

    client-key: path/to/key.key # Path to the client key

kubernetes/helm/openslice/templates/artemis.yaml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ spec: 
    spec:

      containers:

        - image: "{{ .Values.image.artemis.repository }}:{{ .Values.image.artemis.tag | default .Chart.AppVersion }}"

          imagePullPolicy: {{ .Values.image.artemis.pullPolicy | default "Always" }}

          name: {{ include "openslice.fullname" . }}-artemis

          resources:

            {{- toYaml .Values.resources | nindent 12 }}