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

Update payloads to using the ubuntu base image #180

Merged
merged 3 commits into from
Mar 28, 2023
Merged

Update payloads to using the ubuntu base image #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fa442f
enclave-cc: Fix preInstall image tag / hostPath / mountPath
fidencio Mar 14, 2023
0d2a33f
payloads: Update to an image using ubuntu as base
fidencio Mar 14, 2023
c0d0080
e2e: build custom kind node image
mythi Mar 27, 2023
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
9 changes: 8 additions & 1 deletion .github/workflows/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,16 @@ jobs:
env:
IMG: localhost:5000/cc-operator:latest

- name: Build custom kind node image
uses: docker/build-push-action@v4
with:
context: tests/e2e/kind
load: true
tags: kindest/node:v1.26.0-coco

- name: Setup kind cluster
run: |
kind create cluster --image "kindest/node:v1.26.0" -n coco-sgx --config tests/e2e/enclave-cc-kind-config.yaml --wait 120s
kind create cluster --image "kindest/node:v1.26.0-coco" -n coco-sgx --config tests/e2e/enclave-cc-kind-config.yaml --wait 120s
fidencio marked this conversation as resolved.
Show resolved Hide resolved
kubectl label node coco-sgx-worker node-role.kubernetes.io/worker=

- name: Deploy operator from the local registry
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/enclave-cc-cicd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,16 @@ jobs:
env:
IMG: localhost:5000/cc-operator:latest

- name: Build custom kind node image
uses: docker/build-push-action@v4
with:
context: tests/e2e/kind
load: true
tags: kindest/node:v1.26.0-coco

- name: Setup kind cluster
run: |
kind create cluster --image "kindest/node:v1.26.0" -n coco-sgx --config tests/e2e/enclave-cc-kind-config.yaml --wait 120s
kind create cluster --image "kindest/node:v1.26.0-coco" -n coco-sgx --config tests/e2e/enclave-cc-kind-config.yaml --wait 120s
kubectl label node coco-sgx-worker node-role.kubernetes.io/worker=

- name: Deploy operator from the local registry
Expand Down
24 changes: 12 additions & 12 deletions bundle/manifests/cc-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ metadata:
"name": "kata-artifacts"
},
{
"mountPath": "/var/run/dbus",
"mountPath": "/var/run/dbus/system_bus_socket",
"name": "dbus"
},
{
"mountPath": "/run/systemd",
"mountPath": "/run/systemd/system",
"name": "systemd"
},
{
Expand All @@ -84,14 +84,14 @@ metadata:
},
{
"hostPath": {
"path": "/var/run/dbus",
"path": "/var/run/dbus/system_bus_socket",
"type": ""
},
"name": "dbus"
},
{
"hostPath": {
"path": "/run/systemd",
"path": "/run/systemd/system",
"type": ""
},
"name": "systemd"
Expand All @@ -117,11 +117,11 @@ metadata:
"name": "etc-systemd-system"
},
{
"mountPath": "/var/run/dbus",
"mountPath": "/var/run/dbus/system_bus_socket",
"name": "dbus"
},
{
"mountPath": "/run/systemd",
"mountPath": "/run/systemd/system",
"name": "systemd"
}
],
Expand All @@ -142,14 +142,14 @@ metadata:
},
{
"hostPath": {
"path": "/var/run/dbus",
"path": "/var/run/dbus/system_bus_socket",
"type": ""
},
"name": "dbus"
},
{
"hostPath": {
"path": "/run/systemd",
"path": "/run/systemd/system",
"type": ""
},
"name": "systemd"
Expand All @@ -168,11 +168,11 @@ metadata:
"name": "etc-systemd-system"
},
{
"mountPath": "/var/run/dbus",
"mountPath": "/var/run/dbus/system_bus_socket",
"name": "dbus"
},
{
"mountPath": "/run/systemd",
"mountPath": "/run/systemd/system",
"name": "systemd"
}
],
Expand All @@ -193,14 +193,14 @@ metadata:
},
{
"hostPath": {
"path": "/var/run/dbus",
"path": "/var/run/dbus/system_bus_socket",
"type": ""
},
"name": "dbus"
},
{
"hostPath": {
"path": "/run/systemd",
"path": "/run/systemd/system",
"type": ""
},
"name": "systemd"
Expand Down
8 changes: 4 additions & 4 deletions config/samples/ccruntime/base/ccruntime.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ spec:
name: containerd-conf
- mountPath: /opt/confidential-containers/
name: kata-artifacts
- mountPath: /var/run/dbus
- mountPath: /var/run/dbus/system_bus_socket
name: dbus
- mountPath: /run/systemd
- mountPath: /run/systemd/system
name: systemd
- mountPath: /usr/local/bin/
name: local-bin
Expand All @@ -36,11 +36,11 @@ spec:
type: DirectoryOrCreate
name: kata-artifacts
- hostPath:
path: /var/run/dbus
path: /var/run/dbus/system_bus_socket
type: ""
name: dbus
- hostPath:
path: /run/systemd
path: /run/systemd/system
type: ""
name: systemd
- hostPath:
Expand Down
4 changes: 2 additions & 2 deletions config/samples/ccruntime/default/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ images:
- name: quay.io/confidential-containers/container-engine-for-cc-payload
newTag: 98a790e8abdcc06c4b629b290ebaa217bf82e305
- name: quay.io/confidential-containers/runtime-payload
newName: quay.io/confidential-containers/runtime-payload
newTag: kata-containers-129e43d1ea5cca528b7b97234b7561219208a244-x86_64
newName: quay.io/confidential-containers/runtime-payload-ci
newTag: kata-containers-121892ec61cb7d50c662133bb6fbf25b50ab676e-x86_64

patches:
- patch: |-
Expand Down
4 changes: 2 additions & 2 deletions config/samples/ccruntime/s390x/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ resources:

images:
- name: quay.io/confidential-containers/runtime-payload
newName: quay.io/confidential-containers/runtime-payload
newTag: kata-containers-129e43d1ea5cca528b7b97234b7561219208a244-s390x
newName: quay.io/confidential-containers/runtime-payload-ci
newTag: kata-containers-121892ec61cb7d50c662133bb6fbf25b50ab676e-s390x
- name: quay.io/confidential-containers/container-engine-for-cc-payload
newTag: 98a790e8abdcc06c4b629b290ebaa217bf82e305

Expand Down
28 changes: 14 additions & 14 deletions config/samples/enclave-cc/base/ccruntime-enclave-cc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
node-role.kubernetes.io/worker: ""
config:
installType: bundle
payloadImage: quay.io/confidential-containers/runtime-payload:enclave-cc-HW-v0.4.0
payloadImage: quay.io/confidential-containers/runtime-payload-ci:enclave-cc-HW-4370700439f5524a60cf7a31c7c4f92bbe4dd655
installDoneLabel:
confidentialcontainers.org/enclave-cc: "true"
uninstallDoneLabel:
Expand All @@ -21,9 +21,9 @@ spec:
name: enclave-cc-conf
- mountPath: /opt/confidential-containers/
name: enclave-cc-artifacts
- mountPath: /var/run/dbus
- mountPath: /var/run/dbus/system_bus_socket
name: dbus
- mountPath: /run/systemd
- mountPath: /run/systemd/system
name: systemd
- mountPath: /usr/local/bin/
name: local-bin
Expand All @@ -41,11 +41,11 @@ spec:
type: DirectoryOrCreate
name: enclave-cc-artifacts
- hostPath:
path: /var/run/dbus
path: /var/run/dbus/system_bus_socket
type: ""
name: dbus
- hostPath:
path: /run/systemd
path: /run/systemd/system
type: ""
name: systemd
- hostPath:
Expand All @@ -63,9 +63,9 @@ spec:
name: confidential-containers-artifacts
- mountPath: /etc/systemd/system/
name: etc-systemd-system
- mountPath: /var/run/dbus
- mountPath: /var/run/dbus/system_bus_socket
name: dbus
- mountPath: /run/systemd
- mountPath: /run/systemd/system
name: systemd
volumes:
- hostPath:
Expand All @@ -77,23 +77,23 @@ spec:
type: ""
name: etc-systemd-system
- hostPath:
path: /var/run/dbus
path: /var/run/dbus/system_bus_socket
type: ""
name: dbus
- hostPath:
path: /run/systemd
path: /run/systemd/system
type: ""
name: systemd
preInstall:
image: quay.io/confidential-containers/container-engine-for-cc-payload:1def978fdf6b0cb2383d43970c3dc484df3cad54
image: quay.io/confidential-containers/container-engine-for-cc-payload:98a790e8abdcc06c4b629b290ebaa217bf82e305
fidencio marked this conversation as resolved.
Show resolved Hide resolved
volumeMounts:
- mountPath: /opt/confidential-containers/
name: confidential-containers-artifacts
- mountPath: /etc/systemd/system/
name: etc-systemd-system
- mountPath: /var/run/dbus
- mountPath: /var/run/dbus/system_bus_socket
name: dbus
- mountPath: /run/systemd
- mountPath: /run/systemd/system
name: systemd
volumes:
- hostPath:
Expand All @@ -105,11 +105,11 @@ spec:
type: ""
name: etc-systemd-system
- hostPath:
path: /var/run/dbus
path: /var/run/dbus/system_bus_socket
type: ""
name: dbus
- hostPath:
path: /run/systemd
path: /run/systemd/system
type: ""
name: systemd
environmentVariables:
Expand Down
4 changes: 2 additions & 2 deletions config/samples/enclave-cc/sim/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ resources:
nameSuffix: -sgx-mode-sim

images:
- name: quay.io/confidential-containers/runtime-payload
newTag: enclave-cc-SIM-v0.4.0
- name: quay.io/confidential-containers/runtime-payload-ci
newTag: enclave-cc-SIM-4370700439f5524a60cf7a31c7c4f92bbe4dd655
8 changes: 4 additions & 4 deletions docs/PAYLOAD_IMAGE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ Following is an example for Kata runtime depicting the key attributes.
name: containerd-conf
- mountPath: /opt/confidential-containers/
name: kata-artifacts
- mountPath: /var/run/dbus
- mountPath: /var/run/dbus/system_bus_socket
name: dbus
- mountPath: /run/systemd
- mountPath: /run/systemd/system
name: systemd
- mountPath: /usr/local/bin/
name: local-bin
Expand All @@ -46,11 +46,11 @@ Following is an example for Kata runtime depicting the key attributes.
type: DirectoryOrCreate
name: kata-artifacts
- hostPath:
path: /var/run/dbus
path: /var/run/dbus/system_bus_socket
type: ""
name: dbus
- hostPath:
path: /run/systemd
path: /run/systemd/system
type: ""
name: systemd
- hostPath:
Expand Down
10 changes: 10 additions & 0 deletions tests/e2e/kind/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ARG IMAGE=kindest/node
ARG VERSION=1.26
ARG MINOR=0

FROM ${IMAGE}:v${VERSION}.${MINOR}

RUN echo "Installing Packages ..." \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends dbus \
&& systemctl enable dbus