Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare release v1.6.0 #753

Merged
merged 2 commits into from
Oct 30, 2024
Merged

Prepare release v1.6.0 #753

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8916ab2
Prepare release v1.6.0
daniel-weisse Oct 30, 2024
cf06b0f
Update dockerfiles/Dockerfile.coordinator
daniel-weisse Oct 30, 2024
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 CMakeLists.txt
View file
Open in desktop
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.2)
project(marblerun VERSION 1.6.0)
find_package(OpenEnclave CONFIG REQUIRED)

if (NOT CMAKE_BUILD_TYPE)
Expand Down
4 changes: 2 additions & 2 deletions charts/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: v1.5.2
appVersion: v1.6.0
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.2
version: 1.6.0
maintainers:
- name: Edgeless Systems
email: [email protected]
Expand Down
4 changes: 2 additions & 2 deletions charts/README.md
View file
Open in desktop
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.2"` |
| `coordinator.version` | string | Version of the coordinator container image to pull | `"v1.6.0"` |
| `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.2"` |
| `marbleInjector.version` | string | Version of the marbleInjector container image to pull | `"v1.6.0"` |
| `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
View file
Open in desktop
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.2
version: v1.6.0

# 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.2
version: v1.6.0

# Environment configuration for the coordinator control-plane
# meshServerPort needs to be configured to the same port as in the data-plane marbles
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.build-base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:jammy-20240808
FROM ubuntu:jammy-20240911.1
RUN apt-get update && apt-get install -dy --no-install-recommends \
build-essential \
ca-certificates \
Expand Down
6 changes: 3 additions & 3 deletions dockerfiles/Dockerfile.cli
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/edgelesssys/marblerun/build-base-focal:v1.5.2 AS build
FROM ghcr.io/edgelesssys/marblerun/build-base-focal:v1.6.0 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.6
ARG mrtag=v1.5.2
ARG erttag=v0.4.7
ARG mrtag=v1.6.0
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
10 changes: 5 additions & 5 deletions dockerfiles/Dockerfile.coordinator
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/edgelesssys/marblerun/build-base:v1.5.2 AS build
FROM ghcr.io/edgelesssys/marblerun/build-base:v1.6.0 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.6
ARG mrtag=v1.5.2
ARG erttag=v0.4.7
ARG mrtag=v1.6.0
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 Expand Up @@ -44,8 +44,8 @@ COPY --from=build /mrbuild/marblerun /marblerun-ubuntu-22.04

# the coordinator container image
FROM ubuntu:jammy-20240808 AS release
daniel-weisse marked this conversation as resolved.
Show resolved Hide resolved
ARG PSW_VERSION=2.24.100.3-jammy1
ARG DCAP_VERSION=1.21.100.3-jammy1
ARG PSW_VERSION=2.25.100.3-jammy1
ARG DCAP_VERSION=1.22.100.3-jammy1
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates libcurl4 wget \
&& wget -qO /etc/apt/keyrings/intel-sgx-keyring.asc https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key \
&& echo 'deb [signed-by=/etc/apt/keyrings/intel-sgx-keyring.asc arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main' > /etc/apt/sources.list.d/intel-sgx.list \
Expand Down