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

CAAS bundle deployments #12899

Merged
merged 5 commits into from
Apr 19, 2021
Merged

Conversation

SimonRichardson
Copy link
Member

@SimonRichardson SimonRichardson commented Apr 19, 2021

As we don't have the kubernetes in the charm URL we have to then
fallback to the charm metadata. In this instances we can do that and we
can inspect it.

The great thing about this change is that is suppliments the existing
workflow of checking the computed series, so this should work with old
style charms. The worst case is that you might end up with checking the
same series twice, but that's always been the case.

QA steps

bundle.yaml:

bundle: kubernetes
applications:
  snappass:
    charm: facundo-snappass-test
    scale: 1
$ make microk8s-operator-update
$ juju bootstrap microk8s micro

$ juju deploy ./bundle.yaml
Located charm "facundo-snappass-test" in charm-hub
Executing changes:
- upload charm facundo-snappass-test from charm-hub for series kubernetes
- deploy application snappass from charm-hub with 1 unit on kubernetes using facundo-snappass-test
  added resource redis-image
  added resource snappass-image
Deploy of bundle completed.

As we don't have the kubernetes in the charm URL we have to then
fallback to the charm metadata. In this instances we can do that and we
can inspect it.

The great thing about this change is that is suppliments the existing
workflow of checking the computed series, so this should work with old
style charms. The worst case is that you might end up with checking the
same series twice, but that's always been the case.
told about kubernetes even if it is a format v2 charm.  In this case,
kubernetes is no longer in the charm url.
@hmlanigan hmlanigan force-pushed the caas-bundle-deployment branch from a717afb to d82f48e Compare April 19, 2021 20:08
@hmlanigan
Copy link
Member

Added tests, and rebased

@hmlanigan hmlanigan marked this pull request as ready for review April 19, 2021 20:09
@hmlanigan hmlanigan force-pushed the caas-bundle-deployment branch from d82f48e to 698f913 Compare April 19, 2021 20:10
@hmlanigan
Copy link
Member

tiny change to a commit message to get the checks running

@hmlanigan hmlanigan force-pushed the caas-bundle-deployment branch from 698f913 to 4a799ce Compare April 19, 2021 21:44
@hmlanigan
Copy link
Member

$$merge$$

Copy link
Member

@hmlanigan hmlanigan left a comment

Choose a reason for hiding this comment

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

QA was good.

@hmlanigan
Copy link
Member

$$merge$$

@jujubot jujubot merged commit d0df34f into juju:2.9 Apr 19, 2021
@wallyworld wallyworld mentioned this pull request Apr 21, 2021
jujubot added a commit that referenced this pull request Apr 21, 2021
#12909

Merge 2.9

#12827 Unsubscribe from hub when closing state pool
#12829 Correct default bootstrap-timeout value displayed in help.
#12840 Constraint tags can be used for pod affinity
#12842 Fix upgrade series agent version handling
#12794 Add disk provisioning customization
#12845 Restore space support for manual machines
#12839 Support merging of netplan configs
#12853 Add display type for network-get results
#12854 Fix for LP1921557 sni in Juju login.
#12850 Use Base in Charmhub packge and its response structures.
#12858 Ensure assess-upgrade-series does not report started prematuremly
#12860 Removed logging from core annotations.
#12861 Fixes bug where empty error can happen in storage
#12865 Update Pebble version to include new files API
#12866 Workaround for k8s dashboard URL with k8s client proxy
#12862 Fix/lp 1923051
#12867 Fix/lp 1923561
#12870 Use channel logic in charm library
#12873 Add support for setting pod affinity topology key
#12874 Use Patch instead of Update for ensuring ingress resources
#12831 Integration fixes
#12879 Ensure refresh uses version
#12864 bug: fix for bootstrap fail on vsphere 7 + multi network
#12883 Initial work to allow juju trust for sidecar charms
#12884 Fix ssh with sidecar charms and containers.
#12886 Charmhub bases
#12881 Use charm pkg updates
#12889 Ignore projected volume mounts when looking up juju storage
#12890 Fix passing empty string container name to unit params
#12893 Add CLA checker GH action and remove codecov push action
#12897 Use production charmhub endpoint
#12887 Resource validation error
#12888 Ensure we validate the model target
#12898 Remove usage of systems package from CAAS application provisioner
#12899 CAAS bundle deployments
#12900 Bump up Pebble version to include user/group in list-files
#12901 charm Format helper
#12902 charm Iskubernetes helper
#12903 Display ... for really long k8s app versions in status
#12904 Filter out more full registry paths for app version in status
#12905 Fix k8s bundle deploys with v2 charms
#12906 Register resource-get for containeragent binary

Conflicts mostly due to charm v8 vs v9 imports.
The other one was due to changes to dashboard CLI.
```
# Conflicts:
# api/common/charms/common.go
# api/common/charms/common_test.go
# apiserver/facades/client/application/application.go
# apiserver/facades/client/application/charmstore.go
# apiserver/facades/client/application/update_series_mocks_test.go
# apiserver/facades/client/charms/client.go
# apiserver/facades/client/charms/convertions.go
# apiserver/facades/client/machinemanager/types_mock_test.go
# apiserver/facades/controller/caasoperatorprovisioner/provisioner.go
# cmd/juju/application/deployer/bundlehandler_test.go
# cmd/juju/application/refresh_test.go
# cmd/juju/application/refresher/refresher_mock_test.go
# cmd/juju/dashboard/dashboard.go
# core/charm/strategies_mock_test.go
# core/model/model.go
# core/model/model_test.go
# go.mod
# go.sum
# resource/resourceadapters/charmhub.go
# scripts/win-installer/setup.iss
# service/agentconf_test.go
# snap/snapcraft.yaml
# state/charm.go
# state/migration_export.go
# state/state.go
# version/version.go
# worker/caasfirewallerembedded/applicationworker.go
# worker/caasfirewallerembedded/applicationworker_test.go
```

## QA steps

See PRs
@SimonRichardson SimonRichardson deleted the caas-bundle-deployment branch July 12, 2021 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants