Skip to content

Commit

Permalink
Prepare release v1.5.2 (#726)
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Weiße <[email protected]>
  • Loading branch information
daniel-weisse authored Sep 16, 2024
1 parent c86b428 commit f2f13a4
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.11)

project(marblerun VERSION 1.5.1)
project(marblerun VERSION 1.5.2)
find_package(OpenEnclave CONFIG REQUIRED)

if (NOT CMAKE_BUILD_TYPE)
Expand Down
4 changes: 2 additions & 2 deletions charts/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: v1.5.1
appVersion: v1.5.2
description: The control plane for confidential computing.
home: https://edgeless.systems
keywords:
Expand All @@ -9,7 +9,7 @@ kubeVersion: ">=1.13.0-0"
name: marblerun
sources:
- https://github.com/edgelesssys/marblerun
version: 1.5.1
version: 1.5.2
maintainers:
- name: Edgeless Systems
email: [email protected]
Expand Down
4 changes: 2 additions & 2 deletions charts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ their default values.
| `coordinator.sealDir` | string | Path to the directory used for sealing data. Needs to be consistent with the persisten storage setup | `"/coordinator/data/"` |
| `coordinator.simulation` | bool | SGX simulation settings, set to `true` if your not running on an SGX capable cluster | `false` |
| `coordinator.storageClass` | string | Kubernetes [StorageClass](https://kubernetes.io/docs/concepts/storage/storage-classes/) to use for creating the Coordinator PVC. Leave empty to use the default StorageClass | |
| `coordinator.version` | string | Version of the coordinator container image to pull | `"v1.5.1"` |
| `coordinator.version` | string | Version of the coordinator container image to pull | `"v1.5.2"` |
| `global.coordinatorComponentLabel` | string | Control plane label. Do not edit | `"edgeless.systems/control-plane-component"` |
| `global.coordinatorNamespaceLabel` | string | Control plane label. Do not edit | `"edgeless.systems/control-plane-ns"` |
| `global.podAnnotations` | object | Additional annotations to add to all pods | `{}`|
Expand All @@ -56,7 +56,7 @@ their default values.
| `marbleInjector.start` | bool | Start the marbleInjector webhook | `false` |
| `marbleInjector.replicas` | int | Replicas of the marbleInjector webhook | `1` |
| `marbleInjector.repository` | string | Name of the container registry to pull the marbleInjector image from | `"ghcr.io/edgelesssys/marblerun"` |
| `marbleInjector.version` | string | Version of the marbleInjector container image to pull | `"v1.5.1"` |
| `marbleInjector.version` | string | Version of the marbleInjector container image to pull | `"v1.5.2"` |
| `marbleInjector.useCertManager` | bool | Set to use cert-manager for certificate provisioning. Required when using standalone helm chart for installation | `false` |
| `marbleInjector.objectSelector` | object | ObjectSelector to trigger marble-injector mutation, See the [K8S documentation](https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#matching-requests-objectselector) for more information | `{matchExpressions:[{key:"marblerun/marbletype",operator:"Exists"}]}` |
| `marbleInjector.namespaceSelector` | object | NamespaceSelector to trigger marble-injector mutation, See the [K8S documentation](https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#matching-requests-namespaceselector) for more information | `{}` |
Expand Down
4 changes: 2 additions & 2 deletions charts/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ marbleInjector:
repository: ghcr.io/edgelesssys/marblerun
image: marble-injector
pullPolicy: IfNotPresent
version: v1.5.1
version: v1.5.2

# Set to true to install the injection webhook
start: false
Expand Down Expand Up @@ -61,7 +61,7 @@ coordinator:
repository: ghcr.io/edgelesssys/marblerun
image: coordinator
pullPolicy: IfNotPresent
version: v1.5.1
version: v1.5.2

# Environment configuration for the coordinator control-plane
# meshServerPort needs to be configured to the same port as in the data-plane marbles
Expand Down
6 changes: 3 additions & 3 deletions dockerfiles/Dockerfile.cli
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/edgelesssys/marblerun/build-base-focal:v1.5.1 AS build
FROM ghcr.io/edgelesssys/marblerun/build-base-focal:v1.5.2 AS build

# don't run `apt-get update` because required packages are cached in build-base for reproducibility
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
Expand All @@ -12,8 +12,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
ninja-build \
wget

ARG erttag=v0.4.4
ARG mrtag=v1.5.1
ARG erttag=v0.4.6
ARG mrtag=v1.5.2
ARG goversion=1.21.11
RUN wget -qO- https://go.dev/dl/go${goversion}.linux-amd64.tar.gz | tar -C /usr/local -xz \
&& git clone -b $erttag --depth=1 https://github.com/edgelesssys/edgelessrt \
Expand Down
6 changes: 3 additions & 3 deletions dockerfiles/Dockerfile.coordinator
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/edgelesssys/marblerun/build-base:v1.5.1 AS build
FROM ghcr.io/edgelesssys/marblerun/build-base:v1.5.2 AS build

# don't run `apt-get update` because required packages are cached in build-base for reproducibility
RUN apt-get install -y --no-install-recommends \
Expand All @@ -11,8 +11,8 @@ RUN apt-get install -y --no-install-recommends \
ninja-build \
wget

ARG erttag=v0.4.4
ARG mrtag=v1.5.1
ARG erttag=v0.4.6
ARG mrtag=v1.5.2
ARG goversion=1.21.11
RUN wget -qO- https://go.dev/dl/go${goversion}.linux-amd64.tar.gz | tar -C /usr/local -xz \
&& git clone -b $erttag --depth=1 https://github.com/edgelesssys/edgelessrt \
Expand Down

0 comments on commit f2f13a4

Please sign in to comment.