Merge remote-tracking branch 'origin/master'

Author: OriHoch

apps/mapathataf/values-hasadna-auto-updated.yaml

@@ -1,3 +1,3 @@
-adminImage: ghcr.io/whiletrue-industries/mapathataf-admin:c3b9d8bb1fdbde4559fc8fb95c8023a6530e6f88
-appImage: ghcr.io/whiletrue-industries/mapathataf-app:c3b9d8bb1fdbde4559fc8fb95c8023a6530e6f88
-landingImage: ghcr.io/whiletrue-industries/mapathataf-landing:c3b9d8bb1fdbde4559fc8fb95c8023a6530e6f88
+adminImage: ghcr.io/whiletrue-industries/mapathataf-admin:4690f9ebc863144071329c21868988fe4cedb03e
+appImage: ghcr.io/whiletrue-industries/mapathataf-app:4690f9ebc863144071329c21868988fe4cedb03e
+landingImage: ghcr.io/whiletrue-industries/mapathataf-landing:4690f9ebc863144071329c21868988fe4cedb03e

apps/openbus/values-hasadna-auto-updated.yaml

@@ -1,5 +1,5 @@
 backendImage: ghcr.io/hasadna/open-bus-backend/open-bus-backend:8486e82dd30dcaa887d347899c32c95d96a24435
-mapSearchImage: ghcr.io/hasadna/open-bus-map-search/open-bus-map-search:91021e5e873a1fd11cdb083ed671f2582d927506
+mapSearchImage: ghcr.io/hasadna/open-bus-map-search/open-bus-map-search:108821a7b1656b6524eb86ececa3954040f55025
 pipelinesImage: ghcr.io/hasadna/open-bus-pipelines/open-bus-pipelines:51c29764bcb205fe06c01f5364471cfd68a60cac
 ridesHistoryImage: ghcr.io/hasadna/open-bus-rides-history:0e3f80e056ec3d08c19e913f8764490a8347cb13
 siriEtlImage: docker.pkg.github.com/hasadna/open-bus-siri-etl/open-bus-siri-etl:3f1a0c70f024e93a882ebe36f3f42ffb2bca7818

apps/wordpress/argocd_plugin_env.yaml

@@ -1,2 +1,2 @@
 - name: HELM_ARGS
-  value: -f values-hasadna.yaml
+  value: -f values-hasadna.yaml -f values-hasadna-auto-updated.yaml

apps/wordpress/templates/socialsocialpro-deployment.yaml

@@ -0,0 +1,20 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: socialsocialpro
+spec:
+  selector:
+    matchLabels:
+      app: socialsocialpro
+  replicas: 1
+  revisionHistoryLimit: 5
+  template:
+    metadata:
+      labels:
+        app: socialsocialpro
+    spec:
+      terminationGracePeriodSeconds: 5
+      containers:
+        - name: socialsocialpro
+          image: {{ .Values.socialsocialproImage }}
+          resources: {"requests": {"cpu": "50m", "memory": "100Mi"}, "limits": {"memory": "200Mi"}}

apps/wordpress/templates/socialsocialpro-service.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: socialsocialpro
+spec:
+  selector:
+    app: socialsocialpro
+  ports:
+  - name: "80"
+    port: 80

apps/wordpress/values-hasadna-auto-updated.yaml

@@ -0,0 +1 @@
+socialsocialproImage: ghcr.io/hasadna/socialsocialpro:c36443ca1d8f59ac8625a7e40005b9383c7ce556

apps/wordpress/values-hasadna.yaml

@@ -14,12 +14,13 @@ deployments:
       upload_max_filesize: "100M"
       # Maximum number of files that can be uploaded via a single request
       max_file_uploads: "20"
-  - name: socialpro-social
-    image: wordpress@sha256:78f9132d3d5db7eb781cab58621867aba09d763cbaafab3e9a09ceae66cb1c17
-    resources: '{"requests": {"cpu": "500m", "memory": "1024Mi"}, "limits": {"cpu": "800m", "memory": "2048Mi"}}'
-    pvcName: socialpro-social
-    dbName: socialprosocial
-    php_ini: {}
+# we use a static export of this wordpress site
+#  - name: socialpro-social
+#    image: wordpress@sha256:78f9132d3d5db7eb781cab58621867aba09d763cbaafab3e9a09ceae66cb1c17
+#    resources: '{"requests": {"cpu": "500m", "memory": "1024Mi"}, "limits": {"cpu": "800m", "memory": "2048Mi"}}'
+#    pvcName: socialpro-social
+#    dbName: socialprosocial
+#    php_ini: {}
 
 dbResources: '{"requests": {"cpu": "50m", "memory": "309Mi"}, "limits": {"cpu": "150m", "memory": "2215Mi"}}'
 #dbNfsServer: "~iac:hasadna_nfs1_internal_ip~"
@@ -35,7 +36,7 @@ ingresses:
   - name: socialpro-soial
     rules:
       - host: social.socialpro.org.il
-        serviceName: socialpro-social
+        serviceName: socialsocialpro
         servicePort: 80
 
 vertical_pod_autoscalers:
@@ -46,7 +47,7 @@ vertical_pod_autoscalers:
   kind: deployment
   name: datacity
 
-secrets:
-  - name: socialpro-social
-    data:
-      DB_PASSWORD: "~vault:Projects/wordpress/socialpro_social:db_password~"
+secrets: []
+#  - name: socialpro-social
+#    data:
+#      DB_PASSWORD: "~vault:Projects/wordpress/socialpro_social:db_password~"