Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/entityservice/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.13.0-alpha
v1.13.0-beta
2 changes: 1 addition & 1 deletion deployment/entity-service/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: entity-service
appVersion: 1.12.5
appVersion: 1.13.0-beta
version: 1.13.1
description: Privacy preserving record linkage service
sources:
Expand Down
4 changes: 3 additions & 1 deletion deployment/entity-service/templates/worker-autoscale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
apiVersion: autoscaling/v1
kind: HorizontalPodAutoscaler
metadata:
labels:
{{- include "es.release_labels" . | indent 4 }}
name: worker-auto-scale
spec:
scaleTargetRef:
apiVersion: extensions/v1beta1
kind: Deployment
name: {{ .Release.Name }}-worker
minReplicas: {{ required "workers.replicaCount must be provided." .Values.workers.replicaCount }}
maxReplicas: 20
maxReplicas: {{ required "workers.autoscaler.maxReplicas must be provided." .Values.workers.autoscaler.maxReplicas }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<nitpick mode ON>
the two parameters minReplicas and maxReplicas are clearly related. Why do we set them at different levels in the Values file?
<upgrade to double nitpick mode NOW>
Why do we set the minReplicas value as replicaCount? Wouldn't that just confuse some random DevOps guy when (s)he tries to configure the autoscaler?/
<all nitpick modes OFF>

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We set them at different levels because replicaCount is always required (whether the autoscaler is enabled or not), and I just decided that if the autoscaler is enabled we would use the initial number of replicas as the minimum. I'll add another configurable: workers.autoscaler.minReplicas.

targetCPUUtilizationPercentage: 75
{{- end -}}
9 changes: 5 additions & 4 deletions deployment/entity-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ api:

image:
repository: data61/anonlink-nginx
tag: "v1.4.5"
tag: "v1.4.6-beta"
# pullPolicy: Always
pullPolicy: IfNotPresent

Expand All @@ -44,7 +44,7 @@ api:
app:
image:
repository: data61/anonlink-app
tag: "v1.12.0"
tag: "v1.13.0-beta"
# pullPolicy: IfNotPresent
pullPolicy: Always

Expand All @@ -67,7 +67,7 @@ api:
## It cannot be updated! So we have a separate image + tag
image:
repository: data61/anonlink-app
tag: "v1.12.0"
tag: "v1.13.0-beta"

## Ref: http://kubernetes.io/docs/user-guide/compute-resources/
resources:
Expand Down Expand Up @@ -138,14 +138,15 @@ workers:

image:
repository: "data61/anonlink-app"
tag: "v1.12.0"
tag: "v1.13.0-beta"
pullPolicy: Always

## The number of workers for this deployment
replicaCount: 1

autoscaler:
enabled: false
maxReplicas: 20

podAnnotations: {}

Expand Down
2 changes: 1 addition & 1 deletion deployment/jobs/integration-test-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
restartPolicy: Never
containers:
- name: entitytester
image: data61/anonlink-app:v1.12.0
image: data61/anonlink-app:v1.13.0-beta
imagePullPolicy: Always
env:
- name: SERVER
Expand Down
17 changes: 16 additions & 1 deletion docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,30 @@ Changelog
Next Version
------------

- fixed a bug where a dataprovider could upload her clks multiple time in a project using the same upload token (#463)

Version 1.13.0-beta
-------------------

- fixed a bug where a dataprovider could upload their clks multiple time in a project using the same upload token (#463)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mix of singular and plural. Yes, we celebrate diversity, but that might take it just a tad too far.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also: multiple times

- modify ``similarity_score`` output to follow the group format, which will simplify extending this output type to more parties (#464)
- Tutorials have been improved following an internal review. (#467)
- Database has been changed in preparation to support blocking. (#470)
- Benchmarking results can be saved to Object Store/S3 without authentication. E.g. using node permissions on AWS. (#490)
- Removed duplicate/redundant tests. (#466)
- Update dependencies:
- We have enabled `dependabot <https://dependabot.com/>`_ on GitHub to keep our Python dependencies up to date.
- ``anonlinkclient`` now used for benchmarking (#490)
- Chart dependencies ``redis-ha``, ``postgres`` and ``minio`` all updated.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you link to the corresponding PR, please?



Breaking Change
~~~~~~~~~~~~~~~

- the ``dataproviders`` table `uploaded` field has been modified from a BOOL to an ENUM type (#463)
- the ``similarity_score`` output type has been modified, it now returns a JSON array of JSON objects, where such an object
looks like `[[party_id_0, row_index_0], [party_id_1, row_index_1], score]`. (#464)
- Integration test configuration is now consistent with benchmark config. Instead of setting ``ENTITY_SERVICE_URL`` including
``/api/v1`` now just set the host address in ``SERVER``.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR link


Version 1.13.0-alpha
--------------------
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
# built documents.
#
# The short X.Y version.
version = '1.12'
version = '1.13'
# The full version, including alpha/beta/rc tags.
release = '1.12.0'
release = '1.13.0-beta'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion frontend/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.4.6-alpha
v1.4.6-beta