Skip to content

Commit

Permalink
Bump version (#363)
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 Jan 31, 2023
1 parent 9be81e0 commit 57dd222
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 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 0.6.1)
project(marblerun VERSION 1.0.0)
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: v0.6.2
appVersion: v1.0.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: 0.6.2
version: 1.0.0
maintainers:
- name: Edgeless Systems
email: [email protected]
Expand Down
7 changes: 6 additions & 1 deletion charts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,24 @@ their default values.
| `coordinator.clientServerHost` | string | Hostname of the client-api server | `"0.0.0.0"` |
| `coordinator.clientServerPort` | int | Port of the client-api server configuration | `4433` |
| `coordinator.hostname` | string | DNS-Names for the coordinator certificate | `"localhost"` |
| `coordinator.image` | string | Name of the coordinator container image | `"coordinator"` |
| `coordinator.meshServerHost` | string | Hostname of the mesh-api server | `"0.0.0.0"` |
| `coordinator.meshServerPort` | int | Port of the mesh-api server configuration | `2001` |
| `coordinator.replicas` | int | Number of replicas for each control plane pod | `1` |
| `coordinator.repository` | string | Name of the container registry to pull the coordinator image from | `"ghcr.io/edgelesssys/marblerun"` |
| `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.version` | string | Version of the coordinator container image to pull | `"v1.0.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.image` | object | Image configuration for all components | `{"pullPolicy":"IfNotPresent","version":" v0.5.0","repository":"ghcr.io/edgelesssys"}` |
| `global.podAnnotations` | object | Additional annotations to add to all pods | `{}`|
| `global.podLabels` | object | Additional labels to add to all pods | `{}` |
| `marbleInjector.CABundle` | string | Set this to use a custom CABundle for the MutatingWebhook | `""` |
| `marbleInjector.image` | string | Name of the marbleInjector container image | `"coordinator"` |
| `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.0.0"` |
| `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"}` |
| `tolerations` | object | Tolerations section, See the [K8S documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for more information | `{key:"sgx.intel.com/epc",operator:"Exists",effect:"NoSchedule"}` |
| `dcap.qpl` | string | SGX quote provider library (QPL) to use. Needs to be "intel" if the libsgx-dcap-default-qpl is to be used, otherwise az-dcap-client is used by default | `"azure"` |
Expand Down
8 changes: 4 additions & 4 deletions charts/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@ global:
marbleInjector:
start: false
replicas: 1
repository: ghcr.io/edgelesssys
repository: ghcr.io/edgelesssys/marblerun
image: marble-injector
pullPolicy: IfNotPresent
version: v0.6.1
version: v1.0.0
# Set this to use a custom CABundle for the MutatingWebhook
# CABundle: "CA_Bundle_Base64"


# coordinator configuration
coordinator:
replicas: 1
repository: ghcr.io/edgelesssys
repository: ghcr.io/edgelesssys/marblerun
image: coordinator
pullPolicy: IfNotPresent
version: v0.6.1
version: v1.0.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

0 comments on commit 57dd222

Please sign in to comment.