Browse Source

Fix outdated external references

This change has passed the Promenade resiliency gate.

- Use `master` versions of armada/tiller charts.
- Use consistent and updated HTK version in tests/examples.
   - Fixes resiliency gate which broke due to missed HTK
     version updates [0].
- Updates for "opendev" rebranding.

[0]: https://review.opendev.org/#/c/659863/

Change-Id: Ic145cde908a383b5130b2b0294d48708fcb1823f
changes/51/680451/3
Sean Eagan 2 years ago
parent
commit
2718c1fe0d
12 changed files with 30 additions and 103 deletions
  1. +1
    -1
      Dockerfile
  2. +2
    -2
      doc/source/configuration/index.rst
  3. +5
    -5
      doc/source/design.rst
  4. +1
    -1
      doc/source/developer-onboarding.rst
  5. +1
    -1
      doc/source/getting-started.rst
  6. +5
    -29
      examples/basic/armada-resources.yaml
  7. +7
    -7
      examples/complete/armada-resources.yaml
  8. +2
    -26
      examples/gate/armada-resources.yaml
  9. +1
    -1
      promenade/utils/validation_message.py
  10. +1
    -1
      setup.cfg
  11. +3
    -28
      tests/unit/builder_data/simple/armada-resources.yaml
  12. +1
    -1
      tools/gate/config-templates/bootstrap-armada-config.yaml

+ 1
- 1
Dockerfile View File

@ -18,7 +18,7 @@ FROM ${FROM}
LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \
org.opencontainers.image.url='https://airshipit.org' \
org.opencontainers.image.documentation='https://airship-promenade.readthedocs.org' \
org.opencontainers.image.source='https://git.openstack.org/openstack/airship-promenade' \
org.opencontainers.image.source='https://opendev.org/airship/promenade' \
org.opencontainers.image.vendor='The Airship Authors' \
org.opencontainers.image.licenses='Apache-2.0'


+ 2
- 2
doc/source/configuration/index.rst View File

@ -25,5 +25,5 @@ The provided Armada_ manifest and will be applied on the genesis node as soon
as it is healthy.
.. _Armada: https://github.com/openstack/airship-armada
.. _Deckhand: https://github.com/openstack/airship-deckhand
.. _Armada: https://opendev.org/airship/armada
.. _Deckhand: https://opendev.org/airship/deckhand

+ 5
- 5
doc/source/design.rst View File

@ -6,7 +6,7 @@ Promenade is a Kubernetes_ cluster deployment tool with the following goals:
* Resiliency in the face of node loss and full cluster reboot.
* Bare metal node support without external runtime dependencies.
* Providing a fully functional single-node cluster to allow cluster-hosted
`tooling <https://github.com/openstack/airship-treasuremap>`_ to provision the
`tooling <https://opendev.org/airship/treasuremap>`_ to provision the
remaining cluster nodes.
* Helm_ chart managed component life-cycle.
* API-managed cluster life-cycle.
@ -261,18 +261,18 @@ Alternatives
* Does not support chart-based management of components
.. _Armada: https://github.com/openstack/airship-armada
.. _Armada: https://opendev.org/airship/armada
.. _Bootkube: https://github.com/kubernetes-incubator/bootkube
.. _CNI: https://github.com/containernetworking/cni
.. _Calico: https://github.com/projectcalico/calico
.. _CoreDNS: https://github.com/coredns/coredns
.. _Deckhand: https://github.com/openstack/airship-deckhand
.. _Deckhand: https://opendev.org/airship/deckhand
.. _Docker: https://www.docker.com
.. _Drydock: https://github.com/openstack/airship-drydock
.. _Drydock: https://opendev.org/airship/drydock
.. _Etcd: https://github.com/coreos/etcd
.. _HAProxy: http://www.haproxy.org
.. _Helm: https://github.com/kubernetes/helm
.. _kops: https://github.com/kubernetes/kops
.. _Kubeadm: https://github.com/kubernetes/kubeadm
.. _Kubernetes: https://github.com/kubernetes/kubernetes
.. _Shipyard: https://github.com/openstack/airship-shipyard
.. _Shipyard: https://opendev.org/airship/shipyard

+ 1
- 1
doc/source/developer-onboarding.rst View File

@ -239,4 +239,4 @@ For almost any other application, all of the above must be healthy before they
will function properly.
.. _`valid set of configuration`: https://github.com/openstack/airship-in-a-bottle
.. _`valid set of configuration`: https://opendev.org/airship/airship-in-a-bottle

+ 1
- 1
doc/source/getting-started.rst View File

@ -3,7 +3,7 @@ Getting Started
Note: This document is meant to give a general understanding of how Promenade
could be exercised in a development environment or for general learning and
understanding. For holistic Airship deployment procedures, refer to `Treasuremap <https://github.com/openstack/airship-treasuremap>`_
understanding. For holistic Airship deployment procedures, refer to `Treasuremap <https://opendev.org/airship/treasuremap>`_
Basic Deployment
----------------


+ 5
- 29
examples/basic/armada-resources.yaml View File

@ -112,31 +112,7 @@ data:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: d6996b8004db35acad7d51412b0b3216189e745f
dependencies: []
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: helm-toolkit-tiller
layeringDefinition:
abstract: false
layer: site
storagePolicy: cleartext
data:
chart_name: helm-toolkit
release: helm-toolkit
namespace: helm-toolkit
wait:
timeout: 600
upgrade:
no_hooks: true
values: {}
source:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
reference: b7e2d6839ce600a7c1e2103f55d208ad3f5029ca
dependencies: []
---
schema: armada/Chart/v1
@ -160,7 +136,7 @@ data:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 681dee71b7befd199509b17852b3385d359a15a5
reference: b7e2d6839ce600a7c1e2103f55d208ad3f5029ca
dependencies: []
---
schema: armada/Chart/v1
@ -1155,11 +1131,11 @@ data:
node_selector_value: enabled
source:
type: git
location: https://github.com/openstack/airship-armada
location: https://opendev.org/airship/armada
subpath: charts/tiller
reference: 8d1521e96c6b3163f7f6598ef15a11af0052cf04
reference: master
dependencies:
- helm-toolkit-tiller
- helm-toolkit
---
schema: armada/Chart/v1
metadata:


+ 7
- 7
examples/complete/armada-resources.yaml View File

@ -178,7 +178,7 @@ data:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: master
reference: b7e2d6839ce600a7c1e2103f55d208ad3f5029ca
dependencies: []
---
schema: armada/Chart/v1
@ -1547,7 +1547,7 @@ data:
value: 3858a12230ac3c915f300c664f12063f
source:
type: git
location: https://github.com/openstack/airship-maas
location: https://opendev.org/airship/maas
subpath: charts/maas
reference: master
dependencies:
@ -1691,7 +1691,7 @@ data:
node_selector_value: enabled
source:
type: git
location: https://github.com/openstack/airship-armada
location: https://opendev.org/airship/armada
subpath: charts/tiller
reference: master
dependencies:
@ -1738,7 +1738,7 @@ data:
memcache_security_strategy: None
source:
type: git
location: https://github.com/openstack/airship-deckhand
location: https://opendev.org/airship/deckhand
subpath: charts/deckhand
reference: master
dependencies:
@ -1792,7 +1792,7 @@ data:
ingester: drydock_provisioner.ingester.plugins.yaml.YamlIngester
source:
type: git
location: https://github.com/openstack/airship-drydock
location: https://opendev.org/airship/drydock
subpath: charts/drydock
reference: master
dependencies:
@ -1872,7 +1872,7 @@ data:
port: 31903
source:
type: git
location: https://github.com/openstack/airship-armada
location: https://opendev.org/airship/armada
subpath: charts/armada
reference: master
dependencies:
@ -1932,7 +1932,7 @@ data:
memcache_security_strategy: None
source:
type: git
location: https://github.com/openstack/airship-shipyard
location: https://opendev.org/airship/shipyard
subpath: charts/shipyard
reference: master
dependencies:


+ 2
- 26
examples/gate/armada-resources.yaml View File

@ -116,30 +116,6 @@ data:
dependencies: []
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: helm-toolkit-tiller
layeringDefinition:
abstract: false
layer: site
storagePolicy: cleartext
data:
chart_name: helm-toolkit
release: helm-toolkit
namespace: helm-toolkit
wait:
timeout: 600
upgrade:
no_hooks: true
values: {}
source:
type: git
location: https://opendev.org/openstack/openstack-helm.git
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
dependencies: []
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: infra-helm-toolkit
@ -938,9 +914,9 @@ data:
type: git
location: https://opendev.org/airship/armada.git
subpath: charts/tiller
reference: 8d1521e96c6b3163f7f6598ef15a11af0052cf04
reference: master
dependencies:
- helm-toolkit-tiller
- helm-toolkit
---
schema: armada/Chart/v1
metadata:


+ 1
- 1
promenade/utils/validation_message.py View File

@ -20,7 +20,7 @@ from promenade.utils.message import Message
class ValidationMessage(Message):
""" ValidationMessage per Airship convention:
https://github.com/openstack/airship-in-a-bottle/blob/master/doc/source/api-conventions.rst#output-structure # noqa
https://opendev.org/airship/airship-in-a-bottle/src/branch/master/doc/source/api-conventions.rst#output-structure # noqa
Construction of ValidationMessage message:


+ 1
- 1
setup.cfg View File

@ -6,7 +6,7 @@ summary = 'Promenade is a tool for bootstrapping a resilient '
description-file = README.md
author = The Airship Authors
author-email = airship-discuss@lists.airshipit.org
home-page = https://github.com/openstack/airship-promenade
home-page = https://opendev.org/airship/promenade
classifier =
Intended Audience :: Information Technology


+ 3
- 28
tests/unit/builder_data/simple/armada-resources.yaml View File

@ -117,31 +117,6 @@ data:
dependencies: []
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: helm-toolkit-pinned
layeringDefinition:
abstract: false
layer: site
storagePolicy: cleartext
data:
chart_name: helm-toolkit
release: helm-toolkit
namespace: helm-toolkit
timeout: 600
wait:
timeout: 600
upgrade:
no_hooks: true
values: {}
source:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
dependencies: []
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: infra-helm-toolkit
@ -1008,11 +983,11 @@ data:
node_selector_value: enabled
source:
type: git
location: https://github.com/openstack/airship-armada
location: https://opendev.org/airship/armada
subpath: charts/tiller
reference: 8d1521e96c6b3163f7f6598ef15a11af0052cf04
reference: master
dependencies:
- helm-toolkit-pinned
- helm-toolkit
---
schema: armada/Chart/v1
metadata:


+ 1
- 1
tools/gate/config-templates/bootstrap-armada-config.yaml View File

@ -107,7 +107,7 @@ data:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: d6996b8004db35acad7d51412b0b3216189e745f
reference: b7e2d6839ce600a7c1e2103f55d208ad3f5029ca
dependencies: []
---
schema: armada/Chart/v1


Loading…
Cancel
Save