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.

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

Allow building with podman using make OCI_BUILDER=podman ... #16380

Merged
merged 1 commit into from Oct 6, 2023

Conversation

hpidcock
Copy link
Member

@hpidcock hpidcock commented Oct 5, 2023

Allow building with podman using make OCI_BUILDER=podman ...

QA steps

  • make microk8s-operator-update should use docker
  • make OCI_BUILDER=podman microk8s-operator-update should use podman

Documentation changes

N/A

Links

N/A

Copy link
Member

@wallyworld wallyworld left a comment

Choose a reason for hiding this comment

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

Nice. Seems to work - tested on 3.1 branch. And using podman instead of docker resolve all the intermittent dns / network issues I was seeing as well.

@hpidcock hpidcock added the 2.9 label Oct 5, 2023
Copy link
Member

@tlm tlm left a comment

Choose a reason for hiding this comment

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

lgtm, tested and works for me 🚢 it.

@hpidcock
Copy link
Member Author

hpidcock commented Oct 6, 2023

/merge

@jujubot jujubot merged commit 3ffe3f7 into juju:2.9 Oct 6, 2023
4 of 5 checks passed
@hpidcock hpidcock mentioned this pull request Oct 10, 2023
jujubot added a commit that referenced this pull request Oct 10, 2023
#16406

Forward ports:
- #16380 
- #16390 
- #16374

Conflicts:
- .github/workflows/static-analysis.yml
- Makefile
- apiserver/facades/client/controller/controller.go
- apiserver/facades/controller/caasmodelconfigmanager/register.go
- cmd/juju/commands/bootstrap.go
- controller/config_test.go
- docker/auth_test.go
- provider/equinix/environ.go
@hpidcock hpidcock mentioned this pull request Oct 10, 2023
jujubot added a commit that referenced this pull request Oct 10, 2023
#16409

Forward ports:
- #16380
- #16390
- #16365
- #16374
- #16405
- #16406
- #16408

Conflicts:
- .github/workflows/static-analysis.yml
- Makefile
- apiserver/facades/controller/caasmodelconfigmanager/facade.go
- cmd/containeragent/initialize/package_test.go
- controller/config.go
- controller/config_test.go
- provider/equinix/environ.go
@hpidcock hpidcock mentioned this pull request Oct 10, 2023
jujubot added a commit that referenced this pull request Oct 11, 2023
#16410

Forward ports:
- #16380
- #16390
- #16365
- #16374
- #16405
- #16406
- #16408
- #16409

Conflicts:
- Makefile
- cmd/containeragent/initialize/package_test.go
- docker/registry/registry.go
- docker/registry/registry_test.go
- make_functions.sh
@hpidcock hpidcock mentioned this pull request Oct 11, 2023
jujubot added a commit that referenced this pull request Oct 12, 2023
#16415

Forward ports:
- #16380
- #16390
- #16365
- #16374
- #16405
- #16406
- #16408
- #16409
- #16403
- #16411
- #16412
- #16410

Conflicts:
- apiserver/facades/client/client/client.go
- 🚩 **apiserver/facades/client/controller/controller.go**
- apiserver/facades/client/controller/controller_test.go
- apiserver/facades/controller/caasapplicationprovisioner/provisioner.go
- apiserver/facades/controller/caasmodelconfigmanager/register.go
- apiserver/facades/controller/caasmodeloperator/operator.go
- apiserver/facades/controller/caasoperatorprovisioner/provisioner.go
- apiserver/facades/controller/caasunitprovisioner/provisioner.go
- caas/kubernetes/provider/bootstrap_test.go
- cmd/containeragent/initialize/package_test.go
- controller/config.go
- controller/config_test.go
- internal/docker/auth.go
- worker/caasmodelconfigmanager/worker.go
- worker/caasmodelconfigmanager/worker_test.go

Changes:
- api/controller/caasmodelconfigmanager/client.go
- 🚩 **apiserver/facades/controller/caasmodelconfigmanager/facade.go**
- apiserver/facades/schema.json
- caas/kubernetes/provider/bootstrap.go
- cloudconfig/podcfg/image.go
- cmd/juju/commands/bootstrap.go
- worker/caasmodelconfigmanager/mocks/facade_mock.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
4 participants