Skip to content

Commit

Permalink
DO NOT MERGE: Test out with fork of operator
Browse files Browse the repository at this point in the history
Test out using the fork of operator with peerpodconfig-ctrl commented out in the peer pods ccruntime.

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
  • Loading branch information
stevenhorsman committed May 15, 2024
1 parent 04830ca commit d9f219d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/cloud-api-adaptor/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ image-with-arch: .git-commit ## Build the per arch image
.PHONY: deploy
deploy: ## Deploy cloud-api-adaptor using the operator, according to install/overlays/$(CLOUD_PROVIDER)/kustomization.yaml file.
ifneq ($(CLOUD_PROVIDER),)
kubectl apply -k "github.com/confidential-containers/operator/config/release?ref=v0.8.0"
kubectl apply -k "github.com/confidential-containers/operator/config/samples/ccruntime/peer-pods?ref=v0.8.0"
kubectl apply -k "github.com/stevenhorsman/cc-operator/config/release?ref=comment-out-peerpodconfig-ctrl"
kubectl apply -k "github.com/stevenhorsman/cc-operator/config/samples/ccruntime/peer-pods?ref=comment-out-peerpodconfig-ctrl"
kubectl apply -k install/overlays/$(CLOUD_PROVIDER)
else
$(error CLOUD_PROVIDER is not set)
Expand Down
8 changes: 4 additions & 4 deletions src/cloud-api-adaptor/test/provisioner/provision.go
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ func (p *CloudAPIAdaptor) Delete(ctx context.Context, cfg *envconf.Config) error
}

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

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

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

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

0 comments on commit d9f219d

Please sign in to comment.