Skip to content

Commit ce3bd36

Browse files
committed
feat: refactor to infer the correct kbs certificate
Signed-off-by: Chris Butler <chris.butler@redhat.com>
1 parent c3560f0 commit ce3bd36

3 files changed

Lines changed: 61 additions & 3 deletions

File tree

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
```toml
12
algorithm = "sha384"
23
version = "0.1.0"
34
@@ -7,15 +8,63 @@ version = "0.1.0"
78
[token_configs.coco_as]
89
url = "https://kbs-trustee-operator-system.{{ .Values.global.hubClusterDomain }}"
910
11+
1012
[token_configs.kbs]
1113
url = "https://kbs-trustee-operator-system.{{ .Values.global.hubClusterDomain }}"
14+
cert = """
15+
acmmagickey_trustee_cert
16+
"""
1217
'''
1318
1419
"cdh.toml" = '''
1520
socket = 'unix:///run/confidential-containers/cdh.sock'
1621
credentials = []
1722
1823
[kbc]
19-
name = "cc_kbc"
20-
url = "https://kbs-trustee-operator-system.{{ .Values.global.hubClusterDomain }}"
24+
name = 'cc_kbc'
25+
url = '<url>:<port>'
26+
kbs_cert = """
27+
acmmagickey_trustee_cert
28+
"""
29+
30+
"policy.rego" = '''
31+
package agent_policy
32+
33+
default AddARPNeighborsRequest := true
34+
default AddSwapRequest := true
35+
default CloseStdinRequest := true
36+
default CopyFileRequest := true
37+
default CreateContainerRequest := true
38+
default CreateSandboxRequest := true
39+
default DestroySandboxRequest := true
40+
default ExecProcessRequest := true
41+
default GetMetricsRequest := true
42+
default GetOOMEventRequest := true
43+
default GuestDetailsRequest := true
44+
default ListInterfacesRequest := true
45+
default ListRoutesRequest := true
46+
default MemHotplugByProbeRequest := true
47+
default OnlineCPUMemRequest := true
48+
default PauseContainerRequest := true
49+
default PullImageRequest := true
50+
default ReadStreamRequest := true
51+
default RemoveContainerRequest := true
52+
default RemoveStaleVirtiofsShareMountsRequest := true
53+
default ReseedRandomDevRequest := true
54+
default ResumeContainerRequest := true
55+
default SetGuestDateTimeRequest := true
56+
default SetPolicyRequest := true
57+
default SignalProcessRequest := true
58+
default StartContainerRequest := true
59+
default StartTracingRequest := true
60+
default StatsContainerRequest := true
61+
default StopTracingRequest := true
62+
default TtyWinResizeRequest := true
63+
default UpdateContainerRequest := true
64+
default UpdateEphemeralMountsRequest := true
65+
default UpdateInterfaceRequest := true
66+
default UpdateRoutesRequest := true
67+
default WaitProcessRequest := true
68+
default WriteStreamRequest := true
2169
'''
70+
```
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
name: initdata-placeholder
5+
data:
6+
initdata: '{{ tpl ( .Files.Get "initdata.toml.tpl") . | b64enc }}' # keep as b64
7+
8+

charts/coco-supported/sandbox/templates/peer-pods-cm.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ spec:
3737
AZURE_NSG_ID: '/subscriptions/{{ `{{ (fromJson (fromConfigMap "openshift-cloud-controller-manager" "cloud-conf" "cloud.conf" | toLiteral)).subscriptionId }}` }}/resourceGroups/{{ `{{ (fromJson (fromConfigMap "openshift-cloud-controller-manager" "cloud-conf" "cloud.conf" | toLiteral)).resourceGroup }}` }}/providers/Microsoft.Network/networkSecurityGroups/{{ `{{ (fromJson (fromConfigMap "openshift-cloud-controller-manager" "cloud-conf" "cloud.conf" | toLiteral)).securityGroupName }}` }}'
3838
DISABLECVM: "false"
3939
PROXY_TIMEOUT: "5m"
40-
INITDATA: '{{ tpl ( .Files.Get "initdata.toml.tpl") . | b64enc }}'
40+
INITDATA: '{{ `{{if (lookup "operator.openshift.io/v1" "IngressController" "openshift-ingress-operator" "default").spec.defaultCertificate.name }}{{ fromConfigMap "openshift-sandboxed-containers-operator" "initdata-placeholder" "initdata" | base64dec | replace "acmmagickey_trustee_cert" (fromSecret "openshift-ingress" (lookup "operator.openshift.io/v1" "IngressController" "openshift-ingress-operator" "default").spec.defaultCertificate.name "tls.crt" | base64dec) | base64enc }}{{ else }}{{ fromConfigMap "openshift-sandboxed-containers-operator" "initdata-placeholder" "initdata" | base64dec | replace "acmmagickey_trustee_cert" (fromSecret "openshift-ingress" "router-certs-default" "tls.crt" | base64dec) | base64enc }}{{ end }}` }}'
41+
4142
---
4243
apiVersion: policy.open-cluster-management.io/v1
4344
kind: PlacementBinding

0 commit comments

Comments
 (0)