diff --git a/CMakeLists.txt b/CMakeLists.txt index 50fff72d..a3145771 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.11) -project(edb VERSION 0.2.0) +project(edb VERSION 0.2.1) if (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Debug) diff --git a/Dockerfile b/Dockerfile index 68abd4d6..53803bbd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y \ ninja-build=1.10.0-1build1 \ zlib1g-dev=1:1.2.11.dfsg-2ubuntu1.2 -ARG erttag=v0.2.8 edbtag=v0.2.0 +ARG erttag=v0.2.8 edbtag=v0.2.1 RUN git clone -b $erttag --depth=1 https://github.com/edgelesssys/edgelessrt \ && git clone -b $edbtag --depth=1 https://github.com/edgelesssys/edgelessdb \ && mkdir ertbuild edbbuild diff --git a/charts/Chart.yaml b/charts/Chart.yaml index eb7a3b92..64d8b57b 100644 --- a/charts/Chart.yaml +++ b/charts/Chart.yaml @@ -5,8 +5,8 @@ keywords: - database - confidential-computing type: application -appVersion: v0.2.0 -version: v0.2.0 +appVersion: v0.2.1 +version: v0.2.1 maintainers: - name: Edgeless Systems email: contact@edgeless.systems diff --git a/charts/README.md b/charts/README.md index 85d348a0..e622df09 100644 --- a/charts/README.md +++ b/charts/README.md @@ -52,7 +52,7 @@ their default values. | `edb.simulation` |bool | Needs be set to `true` when running on systems without SGX1+FLC capabilities | `false` | | `edb.sqlApiHost` |string | The network address of the MySQL interface | `"0.0.0.0"` | | `edb.sqlApiPort` |int | Port of the MySQL interface | `3306` | -| `global.image` |object | EdgelessDB image configuration | `{"pullPolicy":"IfNotPresent","version":" v0.2.0","repository":"ghcr.io/edgelesssys"}` | +| `global.image` |object | EdgelessDB image configuration | `{"pullPolicy":"IfNotPresent","version":" v0.2.1","repository":"ghcr.io/edgelesssys"}` | | `global.podAnnotations` |object | Additional annotations to add to all pods | `{}`| | `global.podLabels` |object | Additional labels to add to all pods | `{}` | | `nodeSelector` |object | NodeSelector section, See the [K8S documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector) for more information | `{"beta.kubernetes.io/os": "linux"}` | diff --git a/charts/values.yaml b/charts/values.yaml index 855302ab..5502508a 100644 --- a/charts/values.yaml +++ b/charts/values.yaml @@ -3,7 +3,7 @@ global: image: pullPolicy: IfNotPresent - version: v0.2.0 + version: v0.2.1 repository: ghcr.io/edgelesssys createdBy: Helm diff --git a/go.mod b/go.mod index 4c94093b..38effb10 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/edgelesssys/edgelessdb -go 1.14 +go 1.16 require ( github.com/edgelesssys/ego v0.3.3 @@ -10,6 +10,6 @@ require ( github.com/go-sql-driver/mysql v1.6.0 github.com/spf13/afero v1.6.0 github.com/stretchr/testify v1.7.0 - github.com/tidwall/gjson v1.9.3 // indirect + github.com/tidwall/gjson v1.10.2 // indirect google.golang.org/grpc v1.41.0 ) diff --git a/go.sum b/go.sum index 47663e1d..d4157d23 100644 --- a/go.sum +++ b/go.sum @@ -678,8 +678,8 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tidwall/gjson v1.6.8/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI= -github.com/tidwall/gjson v1.9.3 h1:hqzS9wAHMO+KVBBkLxYdkEeeFHuqr95GfClRLKlgK0E= -github.com/tidwall/gjson v1.9.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/gjson v1.10.2 h1:APbLGOM0rrEkd8WBw9C24nllro4ajFuJu0Sc9hRz8Bo= +github.com/tidwall/gjson v1.10.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=