Commit 183fcfe0 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

- Compose/docker-compose.yaml.configure: image tags must be switched to :develop

- Kubernetes/helm/openslice/values.yaml: image tags must be switched to :develop
- Removed Kubernetes/template folder (legacy kubectl apply installation) + k8sdeploy + k8sremove

fix for #26
parent 5b1cc8d2
Loading
Loading
Loading
Loading
Loading
+10 −10
Original line number Original line Diff line number Diff line
@@ -19,12 +19,12 @@ image:
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla
    pullPolicy: Always
    pullPolicy: Always
    # Overrides the image tag whose default is the chart appVersion.
    # Overrides the image tag whose default is the chart appVersion.
    tag: "2024Q2_RC"
    tag: "develop"
  centrallog:
  centrallog:
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service
    pullPolicy: Always
    pullPolicy: Always
    # Overrides the image tag whose default is the chart appVersion.
    # Overrides the image tag whose default is the chart appVersion.
    tag: "2024Q2_RC"
    tag: "develop"
  keycloak:
  keycloak:
    repository: quay.io/keycloak/keycloak
    repository: quay.io/keycloak/keycloak
    pullPolicy: Always
    pullPolicy: Always
@@ -39,22 +39,22 @@ image:
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano
    pullPolicy: Always
    pullPolicy: Always
    # Overrides the image tag whose default is the chart appVersion.
    # Overrides the image tag whose default is the chart appVersion.
    tag: "2024Q2_RC"
    tag: "develop"
  osom:
  osom:
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom
    pullPolicy: Always
    pullPolicy: Always
    # Overrides the image tag whose default is the chart appVersion.
    # Overrides the image tag whose default is the chart appVersion.
    tag: "2024Q2_RC"
    tag: "develop"
  portalapi:
  portalapi:
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api
    pullPolicy: Always
    pullPolicy: Always
    # Overrides the image tag whose default is the chart appVersion.
    # Overrides the image tag whose default is the chart appVersion.
    tag: "2024Q2_RC"
    tag: "develop"
  osscapi:
  osscapi:
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api
    pullPolicy: Always
    pullPolicy: Always
    # Overrides the image tag whose default is the chart appVersion.
    # Overrides the image tag whose default is the chart appVersion.
    tag: "2024Q2_RC"
    tag: "develop"
  mysql:
  mysql:
    repository: mysql
    repository: mysql
    pullPolicy: Always
    pullPolicy: Always
@@ -64,22 +64,22 @@ image:
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.oas
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.oas
    pullPolicy: Always
    pullPolicy: Always
    # Overrides the image tag whose default is the chart appVersion.
    # Overrides the image tag whose default is the chart appVersion.
    tag: "2024Q2_RC"
    tag: "develop"
  portalweb:
  portalweb:
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web
    pullPolicy: Always
    pullPolicy: Always
    # Overrides the image tag whose default is the chart appVersion.
    # Overrides the image tag whose default is the chart appVersion.
    tag: "2024Q2_RC"
    tag: "develop"
  tmfweb:
  tmfweb:
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web
    pullPolicy: Always
    pullPolicy: Always
    # Overrides the image tag whose default is the chart appVersion.
    # Overrides the image tag whose default is the chart appVersion.
    tag: "2024Q2_RC"
    tag: "develop"
  cridge:
  cridge:
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge
    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge
    pullPolicy: Always
    pullPolicy: Always
    # Overrides the image tag whose default is the chart appVersion.
    # Overrides the image tag whose default is the chart appVersion.
    tag: "2024Q2_RC"
    tag: "develop"


bugzillaurl: example.com:443/bugzilla
bugzillaurl: example.com:443/bugzilla
bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z
bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z

kubernetes/k8sdeploy.sh

deleted100644 → 0
+0 −65
Original line number Original line Diff line number Diff line
#!/bin/bash	

CURRENT_DIR="$(pwd)"
SCRIPT_DIR="$(dirname "$0")"
cd $SCRIPT_DIR

# copy to a workingdir
cp -r ./template ./_apply

kubectl create namespace openslice

kubectl apply -f ./_apply/openslice-ingress.yaml

# wait for ingress to get IP address
INGRESSADDR=""
while [ -z $INGRESSADDR ]; do
  echo "Waiting for external IP"
  INGRESSADDR=$(kubectl -n openslice get ingress openslice-ingress -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
  if [ -z "$INGRESSADDR" ]
  then
    echo "\INGRESSADDR is empty trying hostname"
    INGRESSADDR=$(kubectl -n openslice get ingress openslice-ingress -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')
  else
    echo "\$INGRESSADDR found!"
  fi
  [ -z "$INGRESSADDR" ] && sleep 5
done
echo 'Found external IP: '$INGRESSADDR
find ./_apply/ -type f  -print0 |  xargs -0 sed -i "s/INGRESSADDR/$INGRESSADDR/g"

kubectl apply -f ./_apply/artemis.yaml
kubectl apply -f ./_apply/bugzilla.yaml
kubectl apply -f ./_apply/centrallog.yaml
kubectl apply -f ./_apply/manoclient.yaml
kubectl apply -f ./_apply/kroki.yaml
kubectl apply -f ./_apply/blockdiag.yaml

kubectl apply -f ./_apply/portalweb-config.yaml
kubectl apply -f ./_apply/portalweb-config-nginx.yaml
kubectl apply -f ./_apply/portalweb.yaml

kubectl apply -f ./_apply/tmfweb-config.yaml
kubectl apply -f ./_apply/tmfweb-config-nginx.yaml
kubectl apply -f ./_apply/tmfweb.yaml

kubectl apply -f ./_apply/mysql-config.yaml
kubectl apply -f ./_apply/mysql-pv-pvc.yaml
kubectl apply -f ./_apply/mysql.yaml

kubectl create configmap keycloak-realm-config --from-file=./_apply/realm-export.json --namespace=openslice
kubectl apply -f ./_apply/keycloak.yaml

kubectl apply -f ./_apply/osom-pv-pvc.yaml
kubectl apply -f ./_apply/osom.yaml

kubectl apply -f ./_apply/oasapi-pv-pvc.yaml
kubectl apply -f ./_apply/oasapi.yaml

kubectl apply -f ./_apply/osportalapi-pv-pvc.yaml
kubectl apply -f ./_apply/osportalapi.yaml

kubectl apply -f ./_apply/osscapi-pv-pvc.yaml
kubectl apply -f ./_apply/osscapi.yaml

cd $CURRENT_DIR

kubernetes/k8sremove.sh

deleted100644 → 0
+0 −45
Original line number Original line Diff line number Diff line
#!/bin/bash

CURRENT_DIR="$(pwd)"
SCRIPT_DIR="$(dirname "$0")"
cd $SCRIPT_DIR

kubectl delete -f ./_apply/osscapi.yaml
kubectl delete -f ./_apply/osscapi-pv-pvc.yaml

kubectl delete -f ./_apply/osportalapi.yaml
kubectl delete -f ./_apply/osportalapi-pv-pvc.yaml

kubectl delete -f ./_apply/oasapi.yaml
kubectl delete -f ./_apply/oasapi-pv-pvc.yaml

kubectl delete -f ./_apply/osom.yaml
kubectl delete -f ./_apply/osom-pv-pvc.yaml

kubectl delete -f ./_apply/keycloak.yaml
kubectl delete configmap keycloak-realm-config -n openslice

kubectl delete -f ./_apply/mysql.yaml
kubectl delete -f ./_apply/mysql-pv-pvc.yaml
kubectl delete -f ./_apply/mysql-config.yaml

kubectl delete -f ./_apply/tmfweb-config.yaml
kubectl delete -f ./_apply/tmfweb-config-nginx.yaml
kubectl delete -f ./_apply/tmfweb.yaml

kubectl delete -f ./_apply/portalweb-config.yaml
kubectl delete -f ./_apply/portalweb-config-nginx.yaml
kubectl delete -f ./_apply/portalweb.yaml

kubectl delete -f ./_apply/blockdiag.yaml
kubectl delete -f ./_apply/kroki.yaml
kubectl delete -f ./_apply/manoclient.yaml
kubectl delete -f ./_apply/centrallog.yaml
kubectl delete -f ./_apply/bugzilla.yaml
kubectl delete -f ./_apply/artemis.yaml

kubectl delete -f ./_apply/openslice-ingress.yaml

kubectl delete ns openslice

cd $CURRENT_DIR

kubernetes/template/README.md

deleted100644 → 0
+0 −4
Original line number Original line Diff line number Diff line
Install first an ingress controler
For docker desktop
https://kubernetes.github.io/ingress-nginx/deploy/#docker-desktop

kubernetes/template/artemis.yaml

deleted100644 → 0
+0 −54
Original line number Original line Diff line number Diff line
apiVersion: apps/v1	
kind: Deployment	
metadata:	
  namespace: openslice	
  labels:	
    org.etsi.osl.service: artemis	
  name: artemis	
spec:	
  replicas: 1	
  selector:	
    matchLabels:	
      org.etsi.osl.service: artemis	
  template:	
    metadata:	
      labels:	
        org.etsi.osl.service: artemis	
    spec:	
      containers:	
        - image: apache/activemq-artemis:2.30.0	
          name: artemis	
          ports:	
            - containerPort: 8161	
            - containerPort: 61616	
            - containerPort: 61613	
          volumeMounts:	
            - mountPath: /var/log/activemq	
              name: activemq-log	
      restartPolicy: Always	
      volumes:	
        - name: activemq-log	
          hostPath:	
            path: /var/log/activemq
---
apiVersion: v1
kind: Service
metadata:
  namespace: openslice
  annotations:
  labels:
    org.etsi.osl.service: artemis
  name: artemis
spec:
  ports:
    - name: "8161"
      port: 8161
      targetPort: 8161
    - name: "61616"
      port: 61616
      targetPort: 61616
    - name: "61613"
      port: 61613
      targetPort: 61613
  selector:
    org.etsi.osl.service: artemis
Loading