Skip to content

Commit b846ae2

Browse files
beraldolealberaldoleal
authoredAug 19, 2024
Merge pull request #446 from beraldoleal/release-1.7-v2
Sync release-1.7 with devel
·
v1.7.0v1.7.0-alpha.1
2 parents 8bcea2e + 57a7517 commit b846ae2

13 files changed

+255
-1435
lines changed
 

‎PROJECT

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repo: github.com/openshift/sandboxed-containers-operator
1313
resources:
1414
- group: confidentialcontainers
1515
kind: PeerPodConfig
16-
path: github.com/confidential-containers/cloud-api-adaptor/peerpodconfig-ctrl/api/v1alpha1
16+
path: github.com/confidential-containers/cloud-api-adaptor/src/peerpodconfig-ctrl/api/v1alpha1
1717
version: v1alpha1
1818
- controller: true
1919
domain: kataconfiguration.openshift.io
@@ -30,7 +30,7 @@ resources:
3030
controller: true
3131
domain: confidentialcontainers.org
3232
kind: PeerPod
33-
path: github.com/confidential-containers/cloud-api-adaptor/peerpod-ctrl/api/v1alpha1
33+
path: github.com/confidential-containers/cloud-api-adaptor/src/peerpod-ctrl/api/v1alpha1
3434
version: v1alpha1
3535
- controller: true
3636
group: core

‎config/peerpods/credentials-requests/credentials_request_aws.yaml

+26-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,31 @@ spec:
1010
providerSpec:
1111
apiVersion: cloudcredential.openshift.io/v1
1212
kind: AWSProviderSpec
13-
statementEntries: # limit permissions
13+
statementEntries:
1414
- effect: Allow
15-
action:
16-
- "*"
1715
resource: "*"
16+
action:
17+
- "ec2:*"
18+
# By default we allow all ec2 actions to prevent dysfunctioning for untested configurations.
19+
# The following actions were extracted from AWS CloudTrail Event History,
20+
# filtered based on access key, for peer-pod execution with default configuration.
21+
# use it to restrict the requested permissions.
22+
#- ec2:AuthorizeSecurityGroupIngress
23+
#- ec2:CreateDefaultVpc
24+
#- ec2:CreateImage
25+
#- ec2:CreateKeyPair
26+
#- ec2:CreateTags
27+
#- ec2:CreateSecurityGroup
28+
#- ec2:DeleteKeyPair
29+
#- ec2:DeleteSecurityGroup
30+
#- ec2:DescribeImages
31+
#- ec2:DescribeInstances
32+
#- ec2:DescribeInstanceTypes
33+
#- ec2:DescribeRegions
34+
#- ec2:DescribeSecurityGroups
35+
#- ec2:DescribeSubnets
36+
#- ec2:DescribeVolumes
37+
#- ec2:DescribeVpcs
38+
#- ec2:RunInstances
39+
#- ec2:StopInstances
40+
#- ec2:TerminateInstances

‎config/peerpods/credentials-requests/credentials_request_azure.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ spec:
1010
providerSpec:
1111
apiVersion: cloudcredential.openshift.io/v1
1212
kind: AzureProviderSpec
13-
roleBindings: # limit
14-
- role: Contributor
13+
roleBindings:
14+
- role: Reader
15+
- role: Virtual Machine Contributor
16+
- role: Network Contributor

‎config/peerpods/peerpodssecret.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,10 @@ stringData:
1010
#LIBVIRT_NET: "default
1111
#LIBVIRT_POOL: "default"
1212
#REDHAT_OFFLINE_TOKEN: "" #Required to download rhel base image : Download token from https://access.redhat.com/management/api
13-
13+
#HOST_KEY_CERTS: "" #Download the certificate from https://www.ibm.com/support/resourcelink/api/content/public/host-key-documents.html and make sure the certficate lines are aligned
14+
# Example:
15+
# HOST_KEY_CERTS: |
16+
# -----BEGIN CERTIFICATE-----
17+
# xxx
18+
# xxx
19+
# -----END CERTIFICATE-----

‎config/peerpods/podvm/lib.sh

+51-5
Original file line numberDiff line numberDiff line change
@@ -208,20 +208,36 @@ function prepare_source_code() {
208208
# links must be relative
209209
if [[ "${AGENT_POLICY}" ]]; then
210210
echo "Custom agent policy is being set through the AGENT_POLICY value"
211-
echo ${AGENT_POLICY} | base64 -d > "${podvm_dir}"/files/etc/kata-opa/custom.rego
212-
if [[ $? == 0 ]] && grep -q "agent_policy" "${podvm_dir}"/files/etc/kata-opa/custom.rego; then # checks policy validity
213-
ln -sf custom.rego "${podvm_dir}"/files/etc/kata-opa/default-policy.rego
211+
echo "${AGENT_POLICY}" | base64 -d >"${podvm_dir}"/files/etc/kata-opa/custom.rego
212+
return_code=$?
213+
if [[ "$return_code" == 0 ]] && grep -q "agent_policy" "${podvm_dir}"/files/etc/kata-opa/custom.rego; then # checks policy validity
214+
ln -sf custom.rego "${podvm_dir}"/files/etc/kata-opa/default-policy.rego
214215
else
215216
error_exit "Invalid AGENT_POLICY value set, expected base64 encoded valid agent policy, got: \"${AGENT_POLICY}\""
216-
fi
217+
fi
217218
elif [[ "$CONFIDENTIAL_COMPUTE_ENABLED" == "yes" ]]; then
218219
echo "Setting custom agent policy to CoCo's recommended policy"
219220
sed 's/default ReadStreamRequest := true/default ReadStreamRequest := false/;
220221
s/default ExecProcessRequest := true/default ExecProcessRequest := false/' \
221-
"${podvm_dir}"/files/etc/kata-opa/default-policy.rego > "${podvm_dir}"/files/etc/kata-opa/coco-default-policy.rego
222+
"${podvm_dir}"/files/etc/kata-opa/default-policy.rego >"${podvm_dir}"/files/etc/kata-opa/coco-default-policy.rego
222223
ln -sf coco-default-policy.rego "${podvm_dir}"/files/etc/kata-opa/default-policy.rego
223224
fi
224225
echo "~~~ Current Agent Policy ~~~" && cat "${podvm_dir}"/files/etc/kata-opa/default-policy.rego
226+
227+
# Fix disk mounts for CoCo
228+
if [[ "$CONFIDENTIAL_COMPUTE_ENABLED" == "yes" ]]; then
229+
create_overlay_mount_unit
230+
fi
231+
232+
# Validate and copy HKD for IBM Z Secure Enablement
233+
if [[ "$SE_BOOT" == "true" ]]; then
234+
if [[ -z "$HOST_KEY_CERTS" ]]; then
235+
error_exit "Error: HKD is not present."
236+
else
237+
echo "$HOST_KEY_CERTS" >> "${podvm_dir}/files/HKD.crt"
238+
fi
239+
fi
240+
225241
}
226242

227243
# Download and extract pause container image
@@ -267,6 +283,36 @@ function download_and_extract_pause_image() {
267283

268284
}
269285

286+
# Function to create overlay mount unit in the podvm files
287+
# this ensures rw (overlay) layer for the container images are in memory (encrypted)
288+
function create_overlay_mount_unit() {
289+
# The actual mount point is /run/kata-containers/image/overlay
290+
local unit_name="run-kata\\x2dcontainers-image-overlay.mount"
291+
local unit_path="${podvm_dir}/files/etc/systemd/system/${unit_name}"
292+
293+
cat <<EOF >"${unit_path}"
294+
[Unit]
295+
Description=Mount unit for /run/kata-containers/image/overlay
296+
Before=kata-agent.service
297+
298+
[Mount]
299+
What=tmpfs
300+
Where=/run/kata-containers/image/overlay
301+
Type=tmpfs
302+
303+
[Install]
304+
WantedBy=multi-user.target
305+
EOF
306+
307+
echo "Mount unit created at ${unit_name}"
308+
309+
# Enable the mount unit by creating a symlink
310+
# This syntax works to create the symlink to the unit file in ${podvm_dir}/files/etc/systemd/system
311+
ln -sf ../"${unit_name}" "${podvm_dir}/files/etc/systemd/system/multi-user.target.wants/${unit_name}" ||
312+
error_exit "Failed to enable the overlay mount unit"
313+
314+
}
315+
270316
# Global variables
271317

272318
# Set global variable for the source code directory

‎config/peerpods/podvm/libvirt-podvm-image-cm.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,8 @@ data:
2121
# Libvirt specific
2222
ORG_ID: ""
2323
ACTIVATION_KEY: ""
24-
BASE_OS_VERSION: "9.2"
24+
BASE_OS_VERSION: "9.4"
25+
26+
# To Enable SE for IBM Z
27+
SE_BOOT: "true"
28+

‎config/peerpods/podvm/libvirt-podvm-image-handler.sh

+9-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
# Create image (-c)
99
# Delete image (-C)
1010

11-
set -x
1211
# include common functions from lib.sh
1312
# shellcheck source=/dev/null
1413
# The directory is where libvirt-podvm-image-handler.sh is located
@@ -73,6 +72,15 @@ function create_libvirt_image() {
7372
# Function to dowload the rhel base image
7473

7574
function download_rhel_kvm_guest_qcow2() {
75+
#Validate RHEL version for IBM Z Secure Enablement
76+
if [ "$SE_BOOT" == "true" ]; then
77+
version=$(echo $BASE_OS_VERSION | awk -F "." '{ print $1 }')
78+
release=$(echo $BASE_OS_VERSION | awk -F "." '{ print $2 }')
79+
if [[ "$version" -lt 9 || ("$version" -eq 9 && "$release" -lt 4) ]]; then
80+
error_exit "Libvirt Secure Execution supports RHEL OS version 9.4 or above"
81+
fi
82+
fi
83+
7684
ARCH=$(uname -m)
7785
export ARCH
7886

‎config/peerpods/podvm/osc-podvm-create-job.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,10 @@ spec:
5757
- name: payload
5858
mountPath: /payload
5959
- name: regauth
60-
mountPath: /tmp/regauth
60+
mountPath: /tmp/regauth
6161
- name: ssh-key-secret
6262
mountPath: "/root/.ssh/"
6363
readOnly: true
64-
optional: true
6564
volumes:
6665
- name: payload
6766
emptyDir: {}
@@ -75,4 +74,5 @@ spec:
7574
- key: id_rsa
7675
path: "id_rsa"
7776
defaultMode: 0400
77+
optional: true
7878
restartPolicy: Never

‎config/peerpods/podvm/osc-podvm-delete-job.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ spec:
4949
- name: ssh-key-secret
5050
mountPath: "/root/.ssh/"
5151
readOnly: true
52-
optional: true
5352
volumes:
5453
- name: ssh-key-secret
5554
secret:
@@ -58,5 +57,6 @@ spec:
5857
- key: id_rsa
5958
path: "id_rsa"
6059
defaultMode: 0400
60+
optional: true
6161

6262
restartPolicy: Never

‎controllers/openshift_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"reflect"
2525
"time"
2626

27-
"github.com/confidential-containers/cloud-api-adaptor/peerpodconfig-ctrl/api/v1alpha1"
27+
"github.com/confidential-containers/cloud-api-adaptor/src/peerpodconfig-ctrl/api/v1alpha1"
2828

2929
appsv1 "k8s.io/api/apps/v1"
3030

‎go.mod

+42-63
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ module github.com/openshift/sandboxed-containers-operator
33
go 1.21
44

55
require (
6-
github.com/confidential-containers/cloud-api-adaptor/peerpod-ctrl v0.8.0-alpha.1
7-
github.com/confidential-containers/cloud-api-adaptor/peerpodconfig-ctrl v0.8.0-alpha.1
6+
github.com/confidential-containers/cloud-api-adaptor/src/peerpod-ctrl v0.9.0
7+
github.com/confidential-containers/cloud-api-adaptor/src/peerpodconfig-ctrl v0.9.0
88
github.com/coreos/ignition/v2 v2.9.0
99
github.com/ghodss/yaml v1.0.0
10-
github.com/go-logr/logr v1.2.4
10+
github.com/go-logr/logr v1.4.1
1111
github.com/onsi/ginkgo/v2 v2.9.5
1212
github.com/onsi/gomega v1.27.7
1313
github.com/openshift/api v0.0.0-20231204192004-bfea29e5e6c4
@@ -23,18 +23,16 @@ require (
2323
)
2424

2525
require (
26-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0 // indirect
27-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 // indirect
28-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
26+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
27+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 // indirect
28+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 // indirect
2929
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.2.1 // indirect
3030
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2 v2.2.1 // indirect
31-
github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect
32-
github.com/IBM-Cloud/power-go-client v1.2.3 // indirect
31+
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
3332
github.com/IBM/go-sdk-core/v5 v5.13.1 // indirect
34-
github.com/IBM/platform-services-go-sdk v0.36.0 // indirect
3533
github.com/IBM/vpc-go-sdk v0.35.0 // indirect
36-
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
37-
github.com/avast/retry-go/v4 v4.3.3 // indirect
34+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
35+
github.com/avast/retry-go/v4 v4.5.1 // indirect
3836
github.com/aws/aws-sdk-go-v2 v1.21.0 // indirect
3937
github.com/aws/aws-sdk-go-v2/config v1.15.11 // indirect
4038
github.com/aws/aws-sdk-go-v2/credentials v1.12.6 // indirect
@@ -46,113 +44,94 @@ require (
4644
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect
4745
github.com/aws/aws-sdk-go-v2/service/sso v1.11.9 // indirect
4846
github.com/aws/aws-sdk-go-v2/service/sts v1.16.7 // indirect
49-
github.com/aws/smithy-go v1.14.2 // indirect
47+
github.com/aws/smithy-go v1.17.0 // indirect
5048
github.com/beorn7/perks v1.0.1 // indirect
5149
github.com/cespare/xxhash/v2 v2.2.0 // indirect
52-
github.com/confidential-containers/cloud-api-adaptor v0.8.1-0.20231116150709-232acecae0ca // indirect
53-
github.com/containerd/containerd v1.6.8 // indirect
54-
github.com/containerd/ttrpc v1.2.2 // indirect
55-
github.com/containernetworking/plugins v1.1.1 // indirect
56-
github.com/containers/podman/v4 v4.2.0 // indirect
57-
github.com/coreos/go-iptables v0.6.0 // indirect
50+
github.com/confidential-containers/cloud-api-adaptor/src/cloud-providers v0.9.0 // indirect
5851
github.com/coreos/go-semver v0.3.1 // indirect
5952
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
6053
github.com/coreos/vcontext v0.0.0-20201120045928-b0e13dab675c // indirect
6154
github.com/davecgh/go-spew v1.1.1 // indirect
62-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
55+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
6356
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
64-
github.com/fatih/color v1.13.0 // indirect
57+
github.com/fatih/color v1.16.0 // indirect
6558
github.com/fsnotify/fsnotify v1.6.0 // indirect
6659
github.com/go-logr/zapr v1.2.4 // indirect
67-
github.com/go-openapi/analysis v0.21.2 // indirect
68-
github.com/go-openapi/errors v0.20.3 // indirect
60+
github.com/go-openapi/errors v0.20.4 // indirect
6961
github.com/go-openapi/jsonpointer v0.19.6 // indirect
7062
github.com/go-openapi/jsonreference v0.20.2 // indirect
71-
github.com/go-openapi/loads v0.21.1 // indirect
72-
github.com/go-openapi/runtime v0.23.0 // indirect
73-
github.com/go-openapi/spec v0.20.4 // indirect
74-
github.com/go-openapi/strfmt v0.21.3 // indirect
75-
github.com/go-openapi/swag v0.22.3 // indirect
76-
github.com/go-openapi/validate v0.22.0 // indirect
63+
github.com/go-openapi/strfmt v0.21.7 // indirect
64+
github.com/go-openapi/swag v0.22.4 // indirect
7765
github.com/go-playground/locales v0.14.1 // indirect
7866
github.com/go-playground/universal-translator v0.18.1 // indirect
79-
github.com/go-playground/validator/v10 v10.11.2 // indirect
67+
github.com/go-playground/validator/v10 v10.13.0 // indirect
8068
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
8169
github.com/gobuffalo/flect v0.3.0 // indirect
8270
github.com/gogo/protobuf v1.3.2 // indirect
83-
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
71+
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
8472
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8573
github.com/golang/protobuf v1.5.3 // indirect
8674
github.com/google/gnostic-models v0.6.8 // indirect
87-
github.com/google/go-cmp v0.5.9 // indirect
75+
github.com/google/go-cmp v0.6.0 // indirect
8876
github.com/google/gofuzz v1.2.0 // indirect
8977
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
90-
github.com/google/uuid v1.3.0 // indirect
78+
github.com/google/uuid v1.6.0 // indirect
9179
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
92-
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
80+
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
9381
github.com/imdario/mergo v0.3.13 // indirect
9482
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9583
github.com/jmespath/go-jmespath v0.4.0 // indirect
9684
github.com/josharian/intern v1.0.0 // indirect
9785
github.com/json-iterator/go v1.1.12 // indirect
98-
github.com/kata-containers/kata-containers/src/runtime v0.0.0-20231109143605-6c2a2a14fe78 // indirect
99-
github.com/kdomanski/iso9660 v0.3.5 // indirect
86+
github.com/kdomanski/iso9660 v0.4.0 // indirect
10087
github.com/kylelemons/godebug v1.1.0 // indirect
101-
github.com/leodido/go-urn v1.2.1 // indirect
88+
github.com/leodido/go-urn v1.2.4 // indirect
10289
github.com/mailru/easyjson v0.7.7 // indirect
10390
github.com/mattn/go-colorable v0.1.13 // indirect
104-
github.com/mattn/go-isatty v0.0.16 // indirect
91+
github.com/mattn/go-isatty v0.0.20 // indirect
10592
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
10693
github.com/mitchellh/mapstructure v1.5.0 // indirect
107-
github.com/moby/sys/mountinfo v0.6.2 // indirect
10894
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
10995
github.com/modern-go/reflect2 v1.0.2 // indirect
11096
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
11197
github.com/oklog/ulid v1.3.1 // indirect
112-
github.com/opencontainers/runtime-spec v1.1.0-rc.1 // indirect
113-
github.com/opentracing/opentracing-go v1.2.0 // indirect
114-
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
98+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
11599
github.com/pkg/errors v0.9.1 // indirect
116100
github.com/prometheus/client_golang v1.16.0 // indirect
117101
github.com/prometheus/client_model v0.4.0 // indirect
118102
github.com/prometheus/common v0.44.0 // indirect
119103
github.com/prometheus/procfs v0.10.1 // indirect
120-
github.com/sirupsen/logrus v1.9.0 // indirect
121104
github.com/spf13/pflag v1.0.5 // indirect
122105
github.com/vincent-petithory/dataurl v0.0.0-20191104211930-d1553a71de50 // indirect
123-
github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
124-
github.com/vishvananda/netns v0.0.4 // indirect
125-
github.com/vmware/govmomi v0.30.0 // indirect
126-
go.mongodb.org/mongo-driver v1.11.2 // indirect
106+
github.com/vmware/govmomi v0.33.1 // indirect
107+
go.mongodb.org/mongo-driver v1.11.3 // indirect
127108
go.uber.org/atomic v1.10.0 // indirect
128109
go.uber.org/multierr v1.11.0 // indirect
129-
golang.org/x/crypto v0.14.0 // indirect
130-
golang.org/x/mod v0.10.0 // indirect
131-
golang.org/x/net v0.17.0 // indirect
132-
golang.org/x/oauth2 v0.10.0 // indirect
133-
golang.org/x/sys v0.13.0 // indirect
134-
golang.org/x/term v0.13.0 // indirect
135-
golang.org/x/text v0.13.0 // indirect
110+
golang.org/x/crypto v0.24.0 // indirect
111+
golang.org/x/mod v0.17.0 // indirect
112+
golang.org/x/net v0.26.0 // indirect
113+
golang.org/x/oauth2 v0.17.0 // indirect
114+
golang.org/x/sync v0.7.0 // indirect
115+
golang.org/x/sys v0.21.0 // indirect
116+
golang.org/x/term v0.21.0 // indirect
117+
golang.org/x/text v0.16.0 // indirect
136118
golang.org/x/time v0.3.0 // indirect
137-
golang.org/x/tools v0.9.1 // indirect
119+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
138120
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
139-
google.golang.org/appengine v1.6.7 // indirect
140-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
141-
google.golang.org/grpc v1.58.3 // indirect
142-
google.golang.org/protobuf v1.32.0 // indirect
121+
google.golang.org/appengine v1.6.8 // indirect
122+
google.golang.org/protobuf v1.33.0 // indirect
143123
gopkg.in/inf.v0 v0.9.1 // indirect
144124
gopkg.in/yaml.v2 v2.4.0 // indirect
145125
gopkg.in/yaml.v3 v3.0.1 // indirect
146126
k8s.io/apiextensions-apiserver v0.28.3 // indirect
147127
k8s.io/component-base v0.28.3 // indirect
148-
k8s.io/cri-api v0.23.1 // indirect
149-
k8s.io/klog/v2 v2.100.1 // indirect
128+
k8s.io/klog/v2 v2.110.1 // indirect
150129
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
151130
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
152-
libvirt.org/go/libvirt v1.8002.0 // indirect
153-
libvirt.org/go/libvirtxml v1.9004.0 // indirect
131+
libvirt.org/go/libvirt v1.9008.0 // indirect
132+
libvirt.org/go/libvirtxml v1.9007.0 // indirect
154133
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
155-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
134+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
156135
sigs.k8s.io/yaml v1.3.0 // indirect
157136
)
158137

‎go.sum

+101-1,349
Large diffs are not rendered by default.

‎main.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"flag"
2222
"os"
2323

24-
peerpodcontrollers "github.com/confidential-containers/cloud-api-adaptor/peerpod-ctrl/controllers"
25-
peerpodconfigcontrollers "github.com/confidential-containers/cloud-api-adaptor/peerpodconfig-ctrl/controllers"
24+
peerpodcontrollers "github.com/confidential-containers/cloud-api-adaptor/src/peerpod-ctrl/controllers"
25+
peerpodconfigcontrollers "github.com/confidential-containers/cloud-api-adaptor/src/peerpodconfig-ctrl/controllers"
2626
configv1 "github.com/openshift/api/config/v1"
2727
secv1 "github.com/openshift/api/security/v1"
2828
mcfgapi "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io"
@@ -48,8 +48,8 @@ import (
4848
_ "sigs.k8s.io/controller-tools/pkg/genall/help/pretty"
4949
_ "sigs.k8s.io/controller-tools/pkg/loader"
5050

51-
peerpod "github.com/confidential-containers/cloud-api-adaptor/peerpod-ctrl/api/v1alpha1"
52-
peerpodconfig "github.com/confidential-containers/cloud-api-adaptor/peerpodconfig-ctrl/api/v1alpha1"
51+
peerpod "github.com/confidential-containers/cloud-api-adaptor/src/peerpod-ctrl/api/v1alpha1"
52+
peerpodconfig "github.com/confidential-containers/cloud-api-adaptor/src/peerpodconfig-ctrl/api/v1alpha1"
5353
ccov1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1"
5454

5555
kataconfigurationv1 "github.com/openshift/sandboxed-containers-operator/api/v1"

0 commit comments

Comments
 (0)
Please sign in to comment.