Skip to content

Commit 68da290

Browse files
committed
Updated bundles/manifests
1 parent 9643337 commit 68da290

8 files changed

+52
-10
lines changed

bundle.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
66
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=kbs-operator
88
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
9-
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.0
9+
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.33.0
1010
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1111
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
1212

bundle/manifests/as-config-grpc-sample_v1_configmap.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ data:
44
{
55
"work_dir": "/opt/confidential-containers/attestation-service",
66
"policy_engine": "opa",
7-
"rvps_store_type": "LocalFs",
87
"rvps_config": {
98
"remote_addr":"http://127.0.0.1:50003"
109
},

bundle/manifests/confidentialcontainers.org_kbsconfigs.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ spec:
6464
description: KbsRvpsConfigMapName is the name of the configmap that
6565
contains the KBS RVPS configuration
6666
type: string
67+
kbsRvpsRefValuesConfigMapName:
68+
description: kbsRvpsRefValuesConfigMapName is the name of the configmap
69+
that contains the RVPS reference values
70+
type: string
6771
kbsSecretResources:
6872
description: KbsSecretResources is an array of secret names that contain
6973
the keys required by clients
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: v1
2+
data:
3+
kbs.pem: LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUNvd0JRWURLMlZ3QXlFQVJmcGxDc0lHZGswbzQzYmtWbjNWU3FmR3ZoM0JYVlBTbklqcS84T2dmQ0U9Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo=
4+
kind: Secret
5+
metadata:
6+
name: kbs-auth-public-key-sample
7+
type: Opaque

bundle/manifests/kbs-operator.clusterserviceversion.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@ metadata:
2323
"kbsAuthSecretName": "kbs-auth-public-key",
2424
"kbsConfigMapName": "kbs-config-grpc",
2525
"kbsDeploymentType": "MicroservicesDeployment",
26-
"kbsSecretResources": [],
26+
"kbsRvpsConfigMapName": "rvps-config-grpc",
27+
"kbsRvpsRefValuesConfigMapName": "rvps-reference-values",
2728
"kbsServiceType": "ClusterIP"
2829
}
2930
}
3031
]
3132
capabilities: Basic Install
32-
createdAt: "2024-03-06T13:10:59Z"
33-
operators.operatorframework.io/builder: operator-sdk-v1.28.0
33+
createdAt: "2024-03-08T11:44:44Z"
34+
operators.operatorframework.io/builder: operator-sdk-v1.33.0
3435
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
3536
name: kbs-operator.v0.0.1
3637
namespace: placeholder
@@ -213,12 +214,12 @@ spec:
213214
fieldRef:
214215
fieldPath: metadata.namespace
215216
- name: KBS_IMAGE_NAME
216-
value: ghcr.io/confidential-containers/key-broker-service:latest
217+
value: ghcr.io/confidential-containers/staged-images/kbs-grpc-as:latest
217218
- name: AS_IMAGE_NAME
218-
value: ghcr.io/confidential-containers/attestation-service:latest
219+
value: ghcr.io/confidential-containers/staged-images/coco-as-grpc:latest
219220
- name: RVPS_IMAGE_NAME
220-
value: ghcr.io/confidential-containers/reference-value-provider-service:latest
221-
image: quay.io/confidential-containers/kbs-operator:latest
221+
value: ghcr.io/confidential-containers/staged-images/rvps:latest
222+
image: controller:latest
222223
livenessProbe:
223224
httpGet:
224225
path: /healthz
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: v1
2+
data:
3+
rvps-config.json: |
4+
{
5+
"address": "0.0.0.0:50003",
6+
"store_type": "LocalJson",
7+
"store_config": {
8+
"file_path": "/opt/confidential-containers/rvps/reference-values/reference-values.json"
9+
}
10+
}
11+
kind: ConfigMap
12+
metadata:
13+
name: rvps-config-grpc-sample
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
apiVersion: v1
2+
data:
3+
reference-values.json: |
4+
[
5+
{
6+
"name": "sample.svn",
7+
"expired": "2025-01-01T00:00:00Z",
8+
"hash-value": [
9+
{
10+
"alg": "sha256",
11+
"value": "1"
12+
}
13+
]
14+
}
15+
]
16+
kind: ConfigMap
17+
metadata:
18+
name: rvps-reference-values-sample

bundle/metadata/annotations.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ annotations:
55
operators.operatorframework.io.bundle.metadata.v1: metadata/
66
operators.operatorframework.io.bundle.package.v1: kbs-operator
77
operators.operatorframework.io.bundle.channels.v1: alpha
8-
operators.operatorframework.io.metrics.builder: operator-sdk-v1.28.0
8+
operators.operatorframework.io.metrics.builder: operator-sdk-v1.33.0
99
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
1010
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
1111

0 commit comments

Comments
 (0)