From 6a2501ad81df05378b694077f53dde45b461fb03 Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Mon, 27 Sep 2021 16:26:47 +0300 Subject: [PATCH] [WIFI-4240] Chg: adapt deployment files to 2.2 renaming --- .github/workflows/ci.yml | 6 ++-- .github/workflows/cleanup.yml | 2 +- docker-entrypoint.d/40-generate-config.sh | 4 +-- helm/Chart.yaml | 2 +- helm/README.md | 38 +++++++++++------------ helm/templates/_helpers.tpl | 6 ++-- helm/templates/deployment.yaml | 32 +++++++++---------- helm/templates/ingress.yaml | 8 ++--- helm/templates/secret-regcred.yaml | 6 ++-- helm/templates/service.yaml | 8 ++--- helm/values.yaml | 12 +++---- 11 files changed, 62 insertions(+), 62 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d90a46..998a491 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: - uses: actions/checkout@v2 - name: Build Docker image - run: docker build -t wlan-cloud-ucentralgw-ui:${{ github.sha }} . + run: docker build -t owgw-ui:${{ github.sha }} . - name: Tag Docker image run: | @@ -51,7 +51,7 @@ jobs: echo "Result tags: $TAGS" for tag in $TAGS; do - docker tag wlan-cloud-ucentralgw-ui:${{ github.sha }} ${{ env.DOCKER_REGISTRY_URL }}/ucentralgw-ui:$tag + docker tag owgw-ui:${{ github.sha }} ${{ env.DOCKER_REGISTRY_URL }}/owgw-ui:$tag done - name: Log into Docker registry @@ -65,4 +65,4 @@ jobs: - name: Push Docker images if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/pull/') || github.ref == 'refs/heads/main' run: | - docker images | grep ${{ env.DOCKER_REGISTRY_URL }}/ucentralgw-ui | awk -F ' ' '{print $1":"$2}' | xargs -I {} docker push {} + docker images | grep ${{ env.DOCKER_REGISTRY_URL }}/owgw-ui | awk -F ' ' '{print $1":"$2}' | xargs -I {} docker push {} diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml index ff413fd..85df110 100644 --- a/.github/workflows/cleanup.yml +++ b/.github/workflows/cleanup.yml @@ -16,4 +16,4 @@ jobs: steps: - run: | export PR_BRANCH_TAG=$(echo ${GITHUB_HEAD_REF#refs/heads/} | tr '/' '-') - curl -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/ucentralgw-ui/$PR_BRANCH_TAG" + curl -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/owgw-ui/$PR_BRANCH_TAG" diff --git a/docker-entrypoint.d/40-generate-config.sh b/docker-entrypoint.d/40-generate-config.sh index 8e96b26..3f55474 100755 --- a/docker-entrypoint.d/40-generate-config.sh +++ b/docker-entrypoint.d/40-generate-config.sh @@ -1,6 +1,6 @@ #!/bin/ash # Check if variables are set -export DEFAULT_UCENTRALSEC_URL="${DEFAULT_UCENTRALSEC_URL:-https://ucentral.dpaas.arilia.com:16001}" -export ALLOW_UCENTRALSEC_CHANGE="${ALLOW_UCENTRALSEC_CHANGE:-false}" +export DEFAULT_OWSEC_URL="${DEFAULT_OWSEC_URL:-https://ucentral.dpaas.arilia.com:16001}" +export ALLOW_OWSEC_CHANGE="${ALLOW_OWSEC_CHANGE:-false}" echo '{"DEFAULT_UCENTRALSEC_URL": "'$DEFAULT_UCENTRALSEC_URL'","ALLOW_UCENTRALSEC_CHANGE": '$ALLOW_UCENTRALSEC_CHANGE'}' > /usr/share/nginx/html/config.json diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 75159a3..86e8dad 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 appVersion: "1.0" description: A Helm chart for Kubernetes -name: ucentralgwui +name: owgwui version: 0.1.0 diff --git a/helm/README.md b/helm/README.md index 3853c98..eedaf73 100644 --- a/helm/README.md +++ b/helm/README.md @@ -1,6 +1,6 @@ -# ucentralgwui +# owgwui -This Helm chart helps to deploy uCentralGW-UI to the Kubernetes clusters. It is mainly used in [assembly chart](https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/chart) as uCentralGW-UI requires other services as dependencies that are considered in that Helm chart. This chart is purposed to define deployment logic close to the application code itself and define default values that could be overriden during deployment. +This Helm chart helps to deploy OpenWIFI Web UI (further on refered as __Web UI__) to the Kubernetes clusters. It is mainly used in [assembly chart](https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/chart) as Web UI requires other services as dependencies that are considered in that Helm chart. This chart is purposed to define deployment logic close to the application code itself and define default values that could be overriden during deployment. ## TL;DR; @@ -11,7 +11,7 @@ $ helm install . ## Introduction -This chart bootstraps an ucentralgwui on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +This chart bootstraps the Web UI on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. ## Installing the Chart @@ -23,7 +23,7 @@ To install the chart with the release name `my-release`: $ helm install --name my-release git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw-ui@helm?ref=main ``` -The command deploys ucentralgwui on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. +The command deploys the Web UI on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. > **Tip**: List all releases using `helm list` @@ -46,21 +46,21 @@ The following table lists the configurable parameters of the chart and their def | replicaCount | number | Amount of replicas to be deployed | `1` | | nameOverride | string | Override to be used for application deployment | | | fullnameOverride | string | Override to be used for application deployment (has priority over nameOverride) | | -| images.ucentralgwui.repository | string | Docker image repository | | -| images.ucentralgwui.tag | string | Docker image tag | `'master'` | -| images.ucentralgwui.pullPolicy | string | Docker image pull policy | `'Always'` | -| services.ucentralgwui.type | string | uCentralGW-UI service type | `'ClusterIP'` | -| services.ucentralgwui.ports.http.servicePort | number | Websocket endpoint port to be exposed on service | `80` | -| services.ucentralgwui.ports.http.targetPort | number | Websocket endpoint port to be targeted by service | `80` | -| services.ucentralgwui.ports.http.protocol | string | Websocket endpoint protocol | `'TCP'` | -| checks.ucentralgwui.liveness.httpGet.path | string | Liveness check path to be used | `'/'` | -| checks.ucentralgwui.liveness.httpGet.port | number | Liveness check port to be used (should be pointint to ALB endpoint) | `http` | -| checks.ucentralgwui.readiness.httpGet.path | string | Readiness check path to be used | `'/'` | -| checks.ucentralgwui.readiness.httpGet.port | number | Readiness check port to be used | `http` | -| ingresses.default.enabled | boolean | Defines if uCentralGW-UI should be exposed via Ingress controller | `False` | -| ingresses.default.hosts | array | List of hosts for exposed uCentralGW-UI | | -| ingresses.default.paths | array | List of paths to be exposed for uCentralGW-UI | | -| public_env_variables | hash | Defines list of environment variables to be passed to uCentralGW-UI (required for application configuration) | | +| images.owgwui.repository | string | Docker image repository | | +| images.owgwui.tag | string | Docker image tag | `'master'` | +| images.owgwui.pullPolicy | string | Docker image pull policy | `'Always'` | +| services.owgwui.type | string | OpenWIFI Web UI service type | `'ClusterIP'` | +| services.owgwui.ports.http.servicePort | number | Websocket endpoint port to be exposed on service | `80` | +| services.owgwui.ports.http.targetPort | number | Websocket endpoint port to be targeted by service | `80` | +| services.owgwui.ports.http.protocol | string | Websocket endpoint protocol | `'TCP'` | +| checks.owgwui.liveness.httpGet.path | string | Liveness check path to be used | `'/'` | +| checks.owgwui.liveness.httpGet.port | number | Liveness check port to be used (should be pointint to ALB endpoint) | `http` | +| checks.owgwui.readiness.httpGet.path | string | Readiness check path to be used | `'/'` | +| checks.owgwui.readiness.httpGet.port | number | Readiness check port to be used | `http` | +| ingresses.default.enabled | boolean | Defines if the Web UI should be exposed via Ingress controller | `False` | +| ingresses.default.hosts | array | List of hosts for the exposed Web UI | | +| ingresses.default.paths | array | List of paths to be exposed for the Web UI | | +| public_env_variables | hash | Defines list of environment variables to be passed to the Web UI (required for application configuration) | | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl index 55e1937..a45de6a 100644 --- a/helm/templates/_helpers.tpl +++ b/helm/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "ucentralgwui.name" -}} +{{- define "owgwui.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -11,7 +11,7 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. */}} -{{- define "ucentralgwui.fullname" -}} +{{- define "owgwui.fullname" -}} {{- if .Values.fullnameOverride -}} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} {{- else -}} @@ -27,6 +27,6 @@ If release name contains chart name it will be used as a full name. {{/* Create chart name and version as used by the chart label. */}} -{{- define "ucentralgwui.chart" -}} +{{- define "owgwui.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml index a8e8592..1a4a32f 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/deployment.yaml @@ -3,36 +3,36 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "ucentralgwui.fullname" . }} + name: {{ include "owgwui.fullname" . }} labels: - app.kubernetes.io/name: {{ include "ucentralgwui.name" . }} - helm.sh/chart: {{ include "ucentralgwui.chart" . }} + app.kubernetes.io/name: {{ include "owgwui.name" . }} + helm.sh/chart: {{ include "owgwui.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} spec: replicas: {{ .Values.replicaCount }} selector: matchLabels: - app.kubernetes.io/name: {{ include "ucentralgwui.name" . }} + app.kubernetes.io/name: {{ include "owgwui.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - {{- with .Values.services.ucentralgwui.labels }} + {{- with .Values.services.owgwui.labels }} {{- toYaml . | nindent 6 }} {{- end }} template: metadata: labels: - app.kubernetes.io/name: {{ include "ucentralgwui.name" . }} + app.kubernetes.io/name: {{ include "owgwui.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - {{- with .Values.services.ucentralgwui.labels }} + {{- with .Values.services.owgwui.labels }} {{- toYaml . | nindent 8 }} {{- end }} spec: containers: - - name: ucentralgwui - image: "{{ .Values.images.ucentralgwui.repository }}:{{ .Values.images.ucentralgwui.tag }}" - imagePullPolicy: {{ .Values.images.ucentralgwui.pullPolicy }} + - name: owgwui + image: "{{ .Values.images.owgwui.repository }}:{{ .Values.images.owgwui.tag }}" + imagePullPolicy: {{ .Values.images.owgwui.pullPolicy }} env: - name: KUBERNETES_DEPLOYED @@ -43,19 +43,19 @@ spec: {{- end }} ports: - {{- range $key, $value := .Values.services.ucentralgwui.ports }} + {{- range $key, $value := .Values.services.owgwui.ports }} - name: {{ $key }} containerPort: {{ $value.targetPort }} protocol: {{ $value.protocol }} {{- end }} - {{- if .Values.checks.ucentralgwui.liveness }} + {{- if .Values.checks.owgwui.liveness }} livenessProbe: - {{- toYaml .Values.checks.ucentralgwui.liveness | nindent 12 }} + {{- toYaml .Values.checks.owgwui.liveness | nindent 12 }} {{- end }} - {{- if .Values.checks.ucentralgwui.readiness }} + {{- if .Values.checks.owgwui.readiness }} readinessProbe: - {{- toYaml .Values.checks.ucentralgwui.readiness | nindent 12 }} + {{- toYaml .Values.checks.owgwui.readiness | nindent 12 }} {{- end }} {{- with .Values.resources }} @@ -66,7 +66,7 @@ spec: imagePullSecrets: {{- range $image, $imageValue := .Values.images }} {{- if $imageValue.regcred }} - - name: {{ include "ucentralgwui.fullname" $root }}-{{ $image }}-regcred + - name: {{ include "owgwui.fullname" $root }}-{{ $image }}-regcred {{- end }} {{- end }} diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml index f2d2fcc..eaf5486 100644 --- a/helm/templates/ingress.yaml +++ b/helm/templates/ingress.yaml @@ -5,10 +5,10 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: - name: {{ include "ucentralgwui.fullname" $root }}-{{ $ingress }} + name: {{ include "owgwui.fullname" $root }}-{{ $ingress }} labels: - app.kubernetes.io/name: {{ include "ucentralgwui.name" $root }} - helm.sh/chart: {{ include "ucentralgwui.chart" $root }} + app.kubernetes.io/name: {{ include "owgwui.name" $root }} + helm.sh/chart: {{ include "owgwui.chart" $root }} app.kubernetes.io/instance: {{ $root.Release.Name }} app.kubernetes.io/managed-by: {{ $root.Release.Service }} {{- with $ingressValue.annotations }} @@ -37,7 +37,7 @@ spec: {{- range $ingressValue.paths }} - path: {{ .path }} backend: - serviceName: {{ include "ucentralgwui.fullname" $root }}-{{ .serviceName }} + serviceName: {{ include "owgwui.fullname" $root }}-{{ .serviceName }} servicePort: {{ .servicePort }} {{- end }} {{- end }} diff --git a/helm/templates/secret-regcred.yaml b/helm/templates/secret-regcred.yaml index 3360d94..fa85272 100644 --- a/helm/templates/secret-regcred.yaml +++ b/helm/templates/secret-regcred.yaml @@ -10,11 +10,11 @@ kind: Secret type: kubernetes.io/dockerconfigjson metadata: labels: - app.kuberentes.io/name: {{ include "ucentralgwui.name" $root }} - helm.sh/chart: {{ include "ucentralgwui.chart" $root }} + app.kuberentes.io/name: {{ include "owgwui.name" $root }} + helm.sh/chart: {{ include "owgwui.chart" $root }} app.kubernetes.io/instance: {{ $root.Release.Name }} app.kubernetes.io/managed-by: {{ $root.Release.Service }} - name: {{ include "ucentralgwui.fullname" $root }}-{{ $image }}-regcred + name: {{ include "owgwui.fullname" $root }}-{{ $image }}-regcred data: .dockerconfigjson: {{ template "imagePullSecret" $imageValue.regcred }} {{- end }} diff --git a/helm/templates/service.yaml b/helm/templates/service.yaml index 264e610..01a0395 100644 --- a/helm/templates/service.yaml +++ b/helm/templates/service.yaml @@ -4,14 +4,14 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "ucentralgwui.fullname" $root }}-{{ $service }} + name: {{ include "owgwui.fullname" $root }}-{{ $service }} {{- with $serviceValue.annotations }} annotations: {{- toYaml . | nindent 4 }} {{- end }} labels: - app.kubernetes.io/name: {{ include "ucentralgwui.name" $root }} - helm.sh/chart: {{ include "ucentralgwui.chart" $root }} + app.kubernetes.io/name: {{ include "owgwui.name" $root }} + helm.sh/chart: {{ include "owgwui.chart" $root }} app.kubernetes.io/instance: {{ $root.Release.Name }} app.kubernetes.io/managed-by: {{ $root.Release.Service }} @@ -39,7 +39,7 @@ spec: {{- end }} {{- end }} selector: - app.kubernetes.io/name: {{ include "ucentralgwui.name" $root }} + app.kubernetes.io/name: {{ include "owgwui.name" $root }} app.kubernetes.io/instance: {{ $root.Release.Name }} {{- with $serviceValue.labels }} {{- toYaml . | nindent 4 }} diff --git a/helm/values.yaml b/helm/values.yaml index cf163b5..49daf6b 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -5,13 +5,13 @@ nameOverride: "" fullnameOverride: "" images: - ucentralgwui: - repository: tip-tip-wlan-cloud-ucentral.jfrog.io/ucentralgw-ui + owgwui: + repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owgw-ui tag: main pullPolicy: Always services: - ucentralgwui: + owgwui: type: ClusterIP ports: http: @@ -20,7 +20,7 @@ services: protocol: TCP checks: - ucentralgwui: + owgwui: liveness: httpGet: path: / @@ -37,7 +37,7 @@ ingresses: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" # tls: - # - secretName: '{{ include "ucentralgwui.fullname" . }}-default-tls' # template may be used + # - secretName: '{{ include "owgwui.fullname" . }}-default-tls' # template may be used # cert: | # CERT_HERE_IN_PEM # key: | @@ -48,7 +48,7 @@ ingresses: - chart-example.local paths: - path: / - serviceName: ucentralgwui + serviceName: owgwui servicePort: http resources: {}