Commit 266e8080 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Merge branch 'OCF169-register-hostname-and-certificate-cn' into 'staging' 

Resolve "Register hostname and certificate CN"

Closes #169

See merge request !155
parents 966bdfc9 dcc5c998

helm/capif/charts/ocf-register/templates/deployment.yaml

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ spec: 
              value: {{ quote .Values.env.logLevel }}

            - name: TIMEOUT

              value: {{ quote .Values.env.timeout }}

            - name: REGISTER_HOSTNAME

              value: {{ quote .Values.env.registerHostname }}

          livenessProbe:

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

          readinessProbe:

helm/capif/charts/ocf-register/values.yaml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ env: 
  vaultPort: 8200

  vaultAccessToken: dev-only-token

  capifHostname: capif-test.example.int

  registerHostname: register

  logLevel: "INFO"

  timeout: "30"

helm/scripts/install_capif.sh

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ install_capif_helm() { 
    --set ocf-security.env.logLevel="$LOG_LEVEL" \

    --set ocf-register.image.repository=$CAPIF_DOCKER_REGISTRY/register \

    --set ocf-register.image.tag=$CAPIF_IMAGE_TAG \

    --set ocf-register.env.registerHostname=$REGISTER_HOSTNAME \

    --set ocf-register.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \

    --set ocf-register.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \

    --set ocf-register.env.vaultPort=$VAULT_PORT \

services/docker-compose-register.yml

+3 −0
Original line number Diff line number Diff line 
services:

  register:

    hostname: ${CAPIF_REGISTER}

    container_name: ${CAPIF_REGISTER}

    build:

      context: ${SERVICES_DIR}/register

    ports:
@@ -14,6 +16,7 @@ services: 
      - LOG_LEVEL=${LOG_LEVEL}

      - TIMEOUT=10

      - CAPIF_HOSTNAME=${CAPIF_HOSTNAME}

      - REGISTER_HOSTNAME=${CAPIF_REGISTER}

    extra_hosts:

      - host.docker.internal:host-gateway

      - vault:host-gateway

services/register/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ 
    libxslt1-dev && \

    rm -rf /var/lib/apt/lists/*

RUN pip3 install --no-cache-dir -r requirements.txt

RUN apt-get update && apt-get install -y --no-install-recommends openssl curl redis

RUN apt-get update && apt-get install -y --no-install-recommends openssl curl redis jq



COPY . /usr/src/app