Skip to content

Commit a5e37f4

Browse files
stevenhorsmanwainersm
authored andcommitted
install|doc|tests/e2e: Update operator version
In order to switch to `main` kata-containers payload we need to switch to use the latest operator. There isn't a released version of it yet that supports the peer pods and nydus-snapshotter changes required, so switch to the latest branch for now Signed-off-by: stevenhorsman <[email protected]>
1 parent ced41b0 commit a5e37f4

File tree

3 files changed

+27
-13
lines changed

3 files changed

+27
-13
lines changed

src/cloud-api-adaptor/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ image-with-arch: .git-commit ## Build the per arch image
121121
.PHONY: deploy
122122
deploy: ## Deploy cloud-api-adaptor using the operator, according to install/overlays/$(CLOUD_PROVIDER)/kustomization.yaml file.
123123
ifneq ($(CLOUD_PROVIDER),)
124-
kubectl apply -k "github.com/confidential-containers/operator/config/release?ref=v0.8.0"
125-
kubectl apply -k "github.com/confidential-containers/operator/config/samples/ccruntime/peer-pods?ref=v0.8.0"
124+
kubectl apply -k "github.com/confidential-containers/operator/config/default"
125+
kubectl apply -k "github.com/confidential-containers/operator/config/samples/ccruntime/peer-pods"
126126
kubectl apply -k install/overlays/$(CLOUD_PROVIDER)
127127
else
128128
$(error CLOUD_PROVIDER is not set)

src/cloud-api-adaptor/install/README.md

+21-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
If using AWS, create VPC and AMI. Similarly for other providers create the
66
necessary resources.
7-
7+
88
* **Setup Kubernetes cluster in the cloud**
99

1010
At least one node in the cluster must have the "worker" role.
@@ -19,7 +19,7 @@
1919
```
2020

2121
If "worker" role is missing, execute the following command to set the role.
22-
22+
2323
```
2424
export NODENAME=<node-name>
2525
kubectl label node $NODENAME node.kubernetes.io/worker=
@@ -56,16 +56,30 @@ Alternatively the manual approach, if you want to pick a specific CoCo release/r
5656
5757
- Deploy the CoCo operator
5858
59-
- Follow the instructions in the ["Deploy the Operator" section](https://github.com/confidential-containers/operator/blob/main/docs/INSTALL.md#deploy-the-operator) of the CoCo Operator's INSTALL.md file.
59+
<!-- TODO - uncomment when 0.9 is released
60+
- Either deploy a release version of the peer pods enabled CoCo operator, by running the following command where
61+
`<RELEASE_VERSION>` needs to be substituted with the desired [release tag](https://github.com/confidential-containers/operator/tags):
62+
> **Note:** the release version needs to be `v0.9.0` or after
63+
```
64+
export RELEASE_VERSION=<RELEASE_VERSION>
65+
kubectl apply -k github.com/confidential-containers/operator/config/overlays/peerpods/default?ref=<RELEASE_VERSION>
66+
```
67+
- Alternatively i-->
68+
- Install the latest development version with:
69+
```
70+
kubectl apply -k "github.com/confidential-containers/operator/config/default"
71+
```
6072
6173
- Create the peer pods variant of the CC custom resource to install the required pieces of CC and create the `kata-remote` `RuntimeClass`
62-
- Again, either deploy a release version of the Confidential Containers peer pod customer resource with, by running the following command where `<RELEASE_VERSION>` needs to be substituted with the desired [release tag](https://github.com/confidential-containers/operator/tags):
63-
> **Note:** the release version needs to be `v0.6.0` or after
74+
<!-- TODO - uncomment when 0.9 is released
75+
- Either deploy a release version of the Confidential Containers peer pod customer resource with, by running the following command where `<RELEASE_VERSION>` needs to be substituted with the desired [release tag](https://github.com/confidential-containers/operator/tags):
76+
> **Note:** the release version needs to be `v0.9.0` or after
6477
```
6578
export RELEASE_VERSION=<RELEASE_VERSION>
6679
kubectl apply -k github.com/confidential-containers/operator/config/samples/ccruntime/peer-pods?ref=<RELEASE_VERSION>
6780
```
68-
- Alternatively install the latest development version with:
81+
- Alternatively i-->
82+
- Install the latest development version with:
6983
```
7084
kubectl apply -k "github.com/confidential-containers/operator/config/samples/ccruntime/peer-pods"
7185
```
@@ -96,7 +110,7 @@ Alternatively the manual approach, if you want to pick a specific CoCo release/r
96110
```
97111
A successful install should show all the PODs with "Running" status under the `confidential-containers-system`
98112
namespace.
99-
113+
100114
```
101115
NAME READY STATUS RESTARTS AGE
102116
cc-operator-controller-manager-546574cf87-phbdv 2/2 Running 0 43m

src/cloud-api-adaptor/test/provisioner/provision.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ func (p *CloudAPIAdaptor) Delete(ctx context.Context, cfg *envconf.Config) error
455455
}
456456

457457
log.Info("Uninstall CCRuntime CRD")
458-
cmd := exec.Command("kubectl", "delete", "-k", "github.com/confidential-containers/operator/config/samples/ccruntime/peer-pods?ref=v0.8.0")
458+
cmd := exec.Command("kubectl", "delete", "-k", "github.com/confidential-containers/operator/config/samples/ccruntime/peer-pods")
459459
cmd.Env = append(os.Environ(), fmt.Sprintf("KUBECONFIG="+cfg.KubeconfigFile()))
460460
stdoutStderr, err := cmd.CombinedOutput()
461461
log.Tracef("%v, output: %s", cmd, stdoutStderr)
@@ -475,7 +475,7 @@ func (p *CloudAPIAdaptor) Delete(ctx context.Context, cfg *envconf.Config) error
475475
deployments := &appsv1.DeploymentList{Items: []appsv1.Deployment{*p.controllerDeployment}}
476476

477477
log.Info("Uninstall the controller manager")
478-
cmd = exec.Command("kubectl", "delete", "-k", "github.com/confidential-containers/operator/config/release?ref=v0.8.0")
478+
cmd = exec.Command("kubectl", "delete", "-k", "github.com/confidential-containers/operator/config/default")
479479
cmd.Env = append(os.Environ(), fmt.Sprintf("KUBECONFIG="+cfg.KubeconfigFile()))
480480
stdoutStderr, err = cmd.CombinedOutput()
481481
log.Tracef("%v, output: %s", cmd, stdoutStderr)
@@ -522,7 +522,7 @@ func (p *CloudAPIAdaptor) Deploy(ctx context.Context, cfg *envconf.Config, props
522522

523523
log.Info("Install the controller manager")
524524
// TODO - find go idiomatic way to apply/delete remote kustomize and apply to this file
525-
cmd := exec.Command("kubectl", "apply", "-k", "github.com/confidential-containers/operator/config/release?ref=v0.8.0")
525+
cmd := exec.Command("kubectl", "apply", "-k", "github.com/confidential-containers/operator/config/default")
526526
cmd.Env = append(os.Environ(), fmt.Sprintf("KUBECONFIG="+cfg.KubeconfigFile()))
527527
stdoutStderr, err := cmd.CombinedOutput()
528528
log.Tracef("%v, output: %s", cmd, stdoutStderr)
@@ -541,7 +541,7 @@ func (p *CloudAPIAdaptor) Deploy(ctx context.Context, cfg *envconf.Config, props
541541
return err
542542
}
543543

544-
cmd = exec.Command("kubectl", "apply", "-k", "github.com/confidential-containers/operator/config/samples/ccruntime/peer-pods?ref=v0.8.0")
544+
cmd = exec.Command("kubectl", "apply", "-k", "github.com/confidential-containers/operator/config/samples/ccruntime/peer-pods")
545545
cmd.Env = append(os.Environ(), fmt.Sprintf("KUBECONFIG="+cfg.KubeconfigFile()))
546546
stdoutStderr, err = cmd.CombinedOutput()
547547
log.Tracef("%v, output: %s", cmd, stdoutStderr)

0 commit comments

Comments
 (0)