Deploy: Allow v1 kubernetes deployments #13171
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The following ensures that we can deploy v1 charms that resolve with
focal API resolution. This broke when cleaning up how we handle series
(for good), but we accidentally broke v1 charms for kubernetes.
The solution is check for kubernetes charms and v1 format, force the
charm series to kuberenetes.
Replication is easy:
cat <<EOF >bundle.yaml
bundle: kubernetes
applications:
prometheus:
charm: prometheus-k8s
scale: 2
grafana:
charm: grafana-k8s
scale: 1
relations:
- - prometheus
- grafana
EOF
juju bootstrap microk8s
juju deploy bundle.yaml
Signed-off-by: Simon Richardson <simon.richardson@canonical.com>
|
|
jujubot
added a commit
that referenced
this pull request
Jul 22, 2021
#13187 Merge from 2.9 to bring forward: - #13184 from manadart/2.9-net-info-iaas-addr-results - #13176 from SimonRichardson/juju-inspect - #13185 from SimonRichardson/logging-unmarshalling-fix - #13181 from SimonRichardson/debug-log-space-labels - #13182 from achilleasa/2.9-fix-error-in-equinix-credential-detection - #13179 from SimonRichardson/update-charm-error-messages - #13178 from manadart/2.9-k9s-no-bootstrap-series - #13175 from manadart/2.9-net-info-ingress-sort - #13174 from SimonRichardson/export-bundle-local-charms - #13170 from manadart/2.9-address-sorting - #13171 from SimonRichardson/deploy-v1-kubernetes - #13172 from wallyworld/azure-instance-lookup - #13167 from jujubot/increment-to-2.9.10 - #13169 from manadart/2.9-space-address-conversion - #13162 from hmlanigan/fix-test-network - #13166 from wallyworld/azure-bespoke-serviceprincipal - #13168 from ycliuhw/fix/lp-1936253 - #13164 from tlm/lp1933548-unit-logging - #13163 from SimonRichardson/deploy-panic-fix - #13160 from SimonRichardson/index-label-logs Conflicts resolved in: - apiserver/facades/agent/uniter/networkinfoiaas.go - core/charm/format.go - core/charm/format_test.go - go.mod - go.sum - provider/azure/config_test.go - provider/azure/environ.go - provider/azure/environ_test.go - provider/azure/environprovider.go - scripts/win-installer/setup.iss - snap/snapcraft.yaml - tests/suites/network/network_health.sh - version/version.go - worker/uniter/runner/jujuc/mocks/context_mock.go
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The following ensures that we can deploy v1 charms that resolve with
focal API resolution. This broke when cleaning up how we handle series
(for good), but we accidentally broke v1 charms for kubernetes.
The solution is check for kubernetes charms and v1 format, force the
charm series to kuberenetes.
QA steps