Skip to content

Commit

Permalink
e2e-test: fix e2e-test pipelines
Browse files Browse the repository at this point in the history
- pin operator manager to use release v0.8.0 tag

Signed-off-by: Da Li Liu <liudali@cn.ibm.com>
  • Loading branch information
Da Li Liu authored and stevenhorsman committed Jan 8, 2024
1 parent aea3761 commit defb3f1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ 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/default?ref=v0.8.0"
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 install/overlays/$(CLOUD_PROVIDER)
else
Expand Down
4 changes: 2 additions & 2 deletions test/provisioner/provision.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,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/default?ref=v0.8.0")
cmd = exec.Command("kubectl", "delete", "-k", "github.com/confidential-containers/operator/config/release?ref=v0.8.0")
cmd.Env = append(os.Environ(), fmt.Sprintf("KUBECONFIG="+cfg.KubeconfigFile()))
stdoutStderr, err = cmd.CombinedOutput()
log.Tracef("%v, output: %s", cmd, stdoutStderr)
Expand All @@ -188,7 +188,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/default?ref=v0.8.0")
cmd := exec.Command("kubectl", "apply", "-k", "github.com/confidential-containers/operator/config/release?ref=v0.8.0")
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 defb3f1

Please sign in to comment.