Add ingressClassName in ingress-web

Rub21 · Rub21 · commit bbe8314a9d8e · 2022-04-05T11:29:39.000-05:00
diff --git a/.github/workflows/chartpress.yaml b/.github/workflows/chartpress.yaml
@@ -16,11 +16,29 @@ jobs:
         python-version: '3.6'
     - name: Setup git
       run: git config --global user.email "noreply@developmentseed.org" && git config --global user.name "Github Action"
-    - name: Install Chartpress
+    - name: Install Chartpress and some python modules
       run: |
-        pip install -v chartpress && pip install six
+        pip install -v chartpress && pip install six && pip install yq
+    - name: Set env vars for publish charts
+      run: |
+        GIT_BRANCH_NAME=${GITHUB_BASE_REF:-${GITHUB_REF#refs/heads/}}
+        GIT_BRANCH_NAME=${GIT_BRANCH_NAME/\//_}
+        OSM_SEED_VERSION=$(yq -r .appVersion ./osm-seed/Chart.yaml)
+        SHORT_GITHUB_SHA=${GITHUB_SHA::7}
+        echo "GIT_BRANCH_NAME=$GIT_BRANCH_NAME" >> $GITHUB_ENV
+        echo "OSM_SEED_VERSION=$OSM_SEED_VERSION" >> $GITHUB_ENV
+        echo "SHORT_GITHUB_SHA=$SHORT_GITHUB_SHA" >> $GITHUB_ENV
     - name: Run Chartpress
-      run: chartpress --push --publish-chart
       env:
         GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }}
-
+        GITHUB_EVENT_NAME: ${{ github.event_name }}
+      run: |
+          if [[ $GIT_BRANCH_NAME = "main" ]]
+          then
+              chartpress --push --publish-chart --tag ${OSM_SEED_VERSION}
+          elif [[ $GIT_BRANCH_NAME = "develop" ]]
+          then
+              chartpress --push --publish-chart --tag ${OSM_SEED_VERSION}-dev.h$SHORT_GITHUB_SHA
+          else
+              chartpress --push --publish-chart
+          fi
diff --git a/envs/.env.cloudprovider.example b/envs/.env.cloudprovider.example
@@ -17,5 +17,4 @@ GCP_STORAGE_BUCKET=osm-seed
 # Azure
 AZURE_STORAGE_ACCOUNT=osmseed
 AZURE_CONTAINER_NAME=osm-seed
-AZURE_STORAGE_ACCESS_KEY=...
 AZURE_STORAGE_CONNECTION_STRING=...
diff --git a/images/tiler-imposm/config/imposm3.json b/images/tiler-imposm/config/imposm3.json
@@ -233,6 +233,69 @@
                 }
             }
         },
+        "landuse_points": {
+            "fields": [
+                {
+                    "type": "id",
+                    "name": "osm_id",
+                    "key": null
+                },
+                {
+                    "type": "geometry",
+                    "name": "geometry",
+                    "key": null
+                },
+                {
+                    "type": "string",
+                    "name": "name",
+                    "key": "name"
+                },
+                {
+                    "type": "mapping_value",
+                    "name": "type",
+                    "key": null
+                },
+                {
+                    "type": "pseudoarea",
+                    "name": "area",
+                    "key": null
+                },
+                {
+                    "type": "hstore_tags",
+                    "name": "tags",
+                    "key": null
+                },
+                {
+                    "type": "mapping_key",
+                    "name": "class",
+                    "key": null
+                }
+            ],
+            "type": "point",
+            "mappings": {
+                "landuse": {
+                    "mapping": {
+                        "landuse": [
+                            "__any__"
+                        ]
+                    }
+                },
+                "leisure": {
+                    "mapping": {
+                        "leisure": [
+                            "__any__"
+                        ]
+                    }
+                },
+                "natural": {
+                    "mapping": {
+                        "natural": [
+                            "__any__"
+                        ]
+                    }
+                }
+            }
+        },
         "water_areas": {
             "fields": [
                 {
diff --git a/images/web/start.sh b/images/web/start.sh
@@ -25,12 +25,14 @@ sed -i -e 's/smtp_authentication: null/smtp_authentication: "login"/g' $workdir/
 sed -i -e 's/smtp_user_name: null/smtp_user_name: "'$MAILER_USERNAME'"/g' $workdir/config/settings.yml
 sed -i -e 's/smtp_password: null/smtp_password: "'$MAILER_PASSWORD'"/g' $workdir/config/settings.yml
 sed -i -e 's/openstreetmap@example.com/'$MAILER_FROM'/g' $workdir/config/settings.yml
-[[ -z "$MAILER_PORT" ]] && MAILER_PORT=25
 sed -i -e 's/smtp_port: 25/smtp_port: '$MAILER_PORT'/g' $workdir/config/settings.yml
 
 #### SET UP ID KEY
 sed -i -e 's/#id_key: ""/id_key: "'$OSM_id_key'"/g' $workdir/config/settings.yml
 
+## SET NOMINATIM URL
+sed -i -e 's/nominatim.openstreetmap.org/'$NOMINATIM_URL'/g' $workdir/config/settings.yml
+
 #### CHECK IF DB IS ALREADY UP AND START THE APP
 flag=true
 while "$flag" = true; do
diff --git a/osm-seed/Chart.yaml b/osm-seed/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 description: "Helm Chart to deploy the OpenStreetMap software"
 name: osm-seed
+appVersion: 1.0.0
 version: ''
-
diff --git a/osm-seed/templates/NOTES.txt b/osm-seed/templates/NOTES.txt
@@ -1,9 +1,5 @@
 1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
-{{- end }}
-{{- else if contains "minikube" .Values.cloudProvider }}
+{{- if contains "minikube" .Values.cloudProvider }}
   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "osm-seed.fullname" . }}-web)
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
@@ -17,4 +13,4 @@
            You can watch the status of by running 'kubectl get svc -w {{ template "osm-seed.fullname" . }}'
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "osm-seed.fullname" . }}-web -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP
-{{- end }}
+{{- end }}
diff --git a/osm-seed/templates/db/db-backup-job.yaml b/osm-seed/templates/db/db-backup-job.yaml
@@ -64,8 +64,6 @@ spec:
                 value: {{ .Values.AZURE_STORAGE_ACCOUNT }}
               - name: AZURE_CONTAINER_NAME
                 value: {{ .Values.AZURE_CONTAINER_NAME }}
-              - name: AZURE_STORAGE_ACCESS_KEY
-                value: {{ .Values.AZURE_STORAGE_ACCESS_KEY }}
               - name: AZURE_STORAGE_CONNECTION_STRING
                 value: {{ .Values.AZURE_STORAGE_CONNECTION_STRING }}
               {{- end }}
diff --git a/osm-seed/templates/db/db-pd.yaml b/osm-seed/templates/db/db-pd.yaml
@@ -10,13 +10,13 @@ metadata:
     environment: {{ .Values.environment }}
     release: {{ .Release.Name }}
 spec:
+  accessModes:
+    - ReadWriteOnce
   ############## Minikube ##############
   {{- if eq .Values.cloudProvider "minikube" }}
   storageClassName: local-storage
   capacity:
     storage: {{ .Values.db.persistenceDisk.localVolumeSize }}
-  accessModes:
-    - ReadWriteOnce
   hostPath:
     path: {{ .Values.db.persistenceDisk.localVolumeHostPath | quote }}
   {{- end }}
@@ -26,8 +26,6 @@ spec:
   storageClassName: ""
   capacity:
     storage: {{ .Values.db.persistenceDisk.AWS_ElasticBlockStore_size }}
-  accessModes:
-    - ReadWriteOnce
   awsElasticBlockStore:
     volumeID: {{ .Values.db.persistenceDisk.AWS_ElasticBlockStore_volumeID }}
     fsType: ext4
@@ -38,12 +36,22 @@ spec:
   storageClassName: ""
   capacity:
     storage: {{ .Values.db.persistenceDisk.GCP_gcePersistentDisk_size }}
-  accessModes:
-    - ReadWriteOnce
   gcePersistentDisk:
     pdName: {{ .Values.db.persistenceDisk.GCP_gcePersistentDisk_pdName }}
     fsType: ext4
   {{- end }}
+
+  ############## Azure Provider ##############
+  {{- if eq .Values.cloudProvider "azure" }}
+  storageClassName: ""
+  capacity:
+    storage: {{ .Values.db.persistenceDisk.AZURE_diskSize }}
+  persistentVolumeReclaimPolicy: Retain
+  azureDisk:
+    kind: Managed
+    diskName: {{ .Values.db.persistenceDisk.AZURE_diskName }}
+    diskURI: {{ .Values.db.persistenceDisk.AZURE_diskURI }}
+  {{- end }}
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -81,5 +89,10 @@ spec:
       {{- if eq .Values.cloudProvider "gcp" }}
       storage: {{ .Values.db.persistenceDisk.GCP_gcePersistentDisk_size }}
       {{- end }}
+
+      ############## AZURE Provider ##############
+      {{- if eq .Values.cloudProvider "azure" }}
+      storage: {{ .Values.db.persistenceDisk.AZURE_diskSize }}
+      {{- end }}
+{{- end }}
 {{- end }}
-{{- end }}
diff --git a/osm-seed/templates/ingress.yaml b/osm-seed/templates/ingress.yaml
diff --git a/osm-seed/templates/jobs/full-history-job.yaml b/osm-seed/templates/jobs/full-history-job.yaml
@@ -60,8 +60,6 @@ spec:
               value: {{ .Values.AZURE_STORAGE_ACCOUNT }}
             - name: AZURE_CONTAINER_NAME
               value: {{ .Values.AZURE_CONTAINER_NAME }}
-            - name: AZURE_STORAGE_ACCESS_KEY
-              value: {{ .Values.AZURE_STORAGE_ACCESS_KEY }}
             - name: AZURE_STORAGE_CONNECTION_STRING
               value: {{ .Values.AZURE_STORAGE_CONNECTION_STRING }}
             {{- end }}
diff --git a/osm-seed/templates/jobs/planet-dump-job.yaml b/osm-seed/templates/jobs/planet-dump-job.yaml
@@ -60,8 +60,6 @@ spec:
               value: {{ .Values.AZURE_STORAGE_ACCOUNT }}
             - name: AZURE_CONTAINER_NAME
               value: {{ .Values.AZURE_CONTAINER_NAME }}
-            - name: AZURE_STORAGE_ACCESS_KEY
-              value: {{ .Values.AZURE_STORAGE_ACCESS_KEY }}
             - name: AZURE_STORAGE_CONNECTION_STRING
               value: {{ .Values.AZURE_STORAGE_CONNECTION_STRING }}
             {{- end }}
diff --git a/osm-seed/templates/jobs/replication-job-deployment.yaml b/osm-seed/templates/jobs/replication-job-deployment.yaml
@@ -60,8 +60,6 @@ spec:
               value: {{ .Values.AZURE_STORAGE_ACCOUNT }}
             - name: AZURE_CONTAINER_NAME
               value: {{ .Values.AZURE_CONTAINER_NAME }}
-            - name: AZURE_STORAGE_ACCESS_KEY
-              value: {{ .Values.AZURE_STORAGE_ACCESS_KEY }}
             - name: AZURE_STORAGE_CONNECTION_STRING
               value: {{ .Values.AZURE_STORAGE_CONNECTION_STRING }}
             {{- end }}
diff --git a/osm-seed/templates/web/web-deployment.yaml b/osm-seed/templates/web/web-deployment.yaml
@@ -64,17 +64,19 @@ spec:
             - name: MAILER_PASSWORD
               value: {{ quote .Values.web.env.MAILER_PASSWORD }}
             - name: MAILER_FROM
-              value: {{ quote .Values.web.env.MAILER_FROM }}
+              value: {{ .Values.web.env.MAILER_FROM }}
+            - name: MAILER_PORT
+              value: {{ .Values.web.env.MAILER_PORT | default "25" | quote }}
             - name: OSM_id_key
               value: {{ .Values.web.env.OSM_id_key }}
             - name: OSM_memcache_servers
               value: {{ .Release.Name }}-memcached:11211
             # Set domain name or pod ip  
-              {{- if .Values.domain.enabled }}
+              {{- if .Values.domain }}
             - name: SERVER_URL
-              value: {{ .Values.domain.domainName }}
+              value: web.{{ .Values.domain }}
             - name: SERVER_PROTOCOL
-              value : {{ .Values.domain.protocolo }}
+              value : "https"
               {{- else }}
             - name: SERVER_URL
               value: dns
diff --git a/osm-seed/templates/web/web-service.yaml b/osm-seed/templates/web/web-service.yaml
@@ -9,21 +9,31 @@ metadata:
     environment: {{ .Values.environment }}
     release: {{ .Release.Name }}
   annotations:
+    {{- if and (eq .Values.serviceType "LoadBalancer") .Values.AWS_SSL_ARN }}
+    service.beta.kubernetes.io/aws-load-balancer-ssl-cert: {{ .Values.AWS_SSL_ARN }}
+    service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
+    service.beta.kubernetes.io/aws-load-balancer-ssl-ports: https    
+    {{- end }}
+    {{- if eq .Values.serviceType "ClusterIP" }}
     kubernetes.io/ingress.class: nginx
-    # nginx.ingress.kubernetes.io/proxy-body-size: "300m"
     cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
+    {{- else }}
+    fake.annotation: fake
+    {{- end }}
+
 spec:
-  {{- if eq .Values.cloudProvider "minikube" }}
-  type: NodePort
-  {{- else }}
-  type: ClusterIP
-  {{- end }}
+  type: {{ .Values.serviceType }}
   ports:
     - port: 80
       targetPort: http
-      nodePort: null
       protocol: TCP
       name: http
+  {{- if and (eq .Values.serviceType "LoadBalancer") .Values.AWS_SSL_ARN }}
+    - port: 443
+      targetPort: http
+      protocol: TCP
+      name: https
+  {{- end }}
   selector:
     app: {{ template "osm-seed.name" . }}
     release: {{ .Release.Name }}
diff --git a/osm-seed/values.yaml b/osm-seed/values.yaml
