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

release: changes to publish 0.9.0 in operator hub #410

Merged
merged 2 commits into from
Aug 13, 2024
Merged

release: changes to publish 0.9.0 in operator hub #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac82050
bundle: updates for v0.9.0
wainersm Aug 6, 2024
90a98ae
docs/OPERATOR_HUB: fix copy instruction
wainersm Aug 6, 2024
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= 0.8.0
VERSION ?= 0.9.0
ARCH = $(shell uname -m)

# CHANNELS define the bundle channels used in the bundle.
Expand Down
34 changes: 25 additions & 9 deletions bundle/manifests/cc-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ metadata:
{
"mountPath": "/usr/local/bin/",
"name": "local-bin"
},
{
"mountPath": "/host/",
"name": "host"
}
],
"installerVolumes": [
Expand Down Expand Up @@ -83,11 +87,18 @@ metadata:
"type": ""
},
"name": "local-bin"
},
{
"hostPath": {
"path": "/",
"type": ""
},
"name": "host"
}
],
"payloadImage": "quay.io/kata-containers/kata-deploy-ci:kata-containers-latest",
"payloadImage": "quay.io/kata-containers/kata-deploy:3.7.0",
"postUninstall": {
"image": "quay.io/confidential-containers/reqs-payload:latest",
"image": "quay.io/confidential-containers/reqs-payload:6bba65f96532fa280b3996dcad2aad10bed777e6",
"volumeMounts": [
{
"mountPath": "/opt/confidential-containers/",
Expand Down Expand Up @@ -149,7 +160,7 @@ metadata:
]
},
"preInstall": {
"image": "quay.io/confidential-containers/reqs-payload:latest",
"image": "quay.io/confidential-containers/reqs-payload:6bba65f96532fa280b3996dcad2aad10bed777e6",
"volumeMounts": [
{
"mountPath": "/opt/confidential-containers/",
Expand Down Expand Up @@ -213,22 +224,27 @@ metadata:
"runtimeClasses": [
{
"name": "kata-clh",
"pulltype": "",
"snapshotter": "nydus"
},
{
"name": "kata-qemu",
"pulltype": "",
"snapshotter": "nydus"
},
{
"name": "kata-qemu-tdx",
"pulltype": "",
"snapshotter": "nydus"
},
{
"name": "kata-qemu-sev",
"pulltype": "",
"snapshotter": "nydus"
},
{
"name": "kata-qemu-snp",
"pulltype": "",
"snapshotter": "nydus"
}
],
Expand All @@ -246,11 +262,11 @@ metadata:
]
capabilities: Basic Install
categories: Security
containerImage: quay.io/confidential-containers/operator:latest
createdAt: "2023-11-30T13:53:32Z"
containerImage: quay.io/confidential-containers/operator:v0.9.0
createdAt: "2024-08-06T14:14:00Z"
operators.operatorframework.io/builder: operator-sdk-v1.30.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
name: cc-operator.v0.8.0
name: cc-operator.v0.9.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -390,7 +406,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: quay.io/confidential-containers/operator:v0.8.0
image: quay.io/confidential-containers/operator:v0.9.0
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -481,5 +497,5 @@ spec:
provider:
name: Confidential Containers Community
url: https://github.com/confidential-containers
replaces: cc-operator.v0.5.0
version: 0.8.0
replaces: cc-operator.v0.8.0
version: 0.9.0
7 changes: 6 additions & 1 deletion bundle/manifests/confidentialcontainers.org_ccruntimes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5686,17 +5686,22 @@ spec:
description: This specifies the RuntimeClasses that need to be
created, with its name and an associated snapshotter to be used
items:
description: RuntimeClass holds the name and the snapshotter
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not exactly sure how this works, but re-running this on your PR I'm getting many more changes to this file. I tried doing it fresh on the main branch and that also brought many more changes to this manifest. Is this expected, did some dependency changed in the mean-time?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wainersm could you please elaborate a bit on this? I'm getting completely different results by running the make bundle IMG=quay.io/confidential-containers/operator:v0.9.0

description: RuntimeClass holds the name and basic customizations
to be used by a runtime class
properties:
name:
description: Name of the runtime class
type: string
pulltype:
description: The pulling image method to be used by the
runtime class
type: string
snapshotter:
description: The snapshotter to be used by the runtime class
type: string
required:
- name
- pulltype
- snapshotter
type: object
type: array
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/confidential-containers/operator
newTag: latest
newTag: v0.9.0
4 changes: 2 additions & 2 deletions config/manifests/bases/cc-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
alm-examples: '[]'
capabilities: Basic Install
categories: Security
containerImage: quay.io/confidential-containers/operator:latest
containerImage: quay.io/confidential-containers/operator:v0.9.0
name: cc-operator.v0.0.1
namespace: placeholder
spec:
Expand Down Expand Up @@ -56,5 +56,5 @@ spec:
provider:
name: Confidential Containers Community
url: https://github.com/confidential-containers
replaces: cc-operator.v0.5.0
replaces: cc-operator.v0.8.0
version: 0.0.1
5 changes: 4 additions & 1 deletion docs/OPERATOR_HUB.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ Follow the steps:

5. Copy the bundle directory to the community-operators repository directory. On the example below I got the community-operators repository cloned to `../../../github.com/k8s-operatorhub/community-operators`:
```shell
cp -r bundle ../../../github.com/k8s-operatorhub/community-operators/operators/cc-operator/${TARGET_RELEASE}
dest_dir="../../../github.com/k8s-operatorhub/community-operators/operators/cc-operator/${TARGET_RELEASE}"
rm -rf "$dest_dir"
mkdir "$dest_dir"
cp -r bundle/* "$dest_dir"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps unnecessarily too complex but does the job :-)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, in the end I made it more complicated :(

```

6. Prepare a commit and push to your tree
Expand Down
Loading