mirror of
https://github.com/openshift/community.okd.git
synced 2026-11-22 07:00:26 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ef6712c8f6 | ||
|
|
570a8ccd27 | ||
|
|
d76430d879 | ||
|
|
2b51c229ad | ||
|
|
d197d28cd1 | ||
|
|
5361c9322e | ||
|
|
6c1dc79c7f | ||
|
|
4cfbde3d14 |
@@ -5,6 +5,22 @@ OKD Collection Release Notes
|
|||||||
.. contents:: Topics
|
.. contents:: Topics
|
||||||
|
|
||||||
|
|
||||||
|
v1.1.0
|
||||||
|
======
|
||||||
|
|
||||||
|
Minor Changes
|
||||||
|
-------------
|
||||||
|
|
||||||
|
- increase the kubernetes.core dependency version number (https://github.com/ansible-collections/community.okd/pull/71).
|
||||||
|
|
||||||
|
v1.0.2
|
||||||
|
======
|
||||||
|
|
||||||
|
Minor Changes
|
||||||
|
-------------
|
||||||
|
|
||||||
|
- restrict the version of kubernetes.core dependency (https://github.com/ansible-collections/community.okd/pull/66).
|
||||||
|
|
||||||
v1.0.1
|
v1.0.1
|
||||||
======
|
======
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# Also needs to be updated in galaxy.yml
|
# Also needs to be updated in galaxy.yml
|
||||||
VERSION = 1.0.1
|
VERSION = 1.1.0
|
||||||
|
|
||||||
# To run sanity tests in a venv, set SANITY_TEST_ARGS to '--venv'
|
# To run sanity tests in a venv, set SANITY_TEST_ARGS to '--venv'
|
||||||
SANITY_TEST_ARGS ?= --docker --color
|
SANITY_TEST_ARGS ?= --docker --color
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ You can also include it in a `requirements.yml` file and install it via `ansible
|
|||||||
---
|
---
|
||||||
collections:
|
collections:
|
||||||
- name: community.okd
|
- name: community.okd
|
||||||
version: 1.0.1
|
version: 1.1.0
|
||||||
```
|
```
|
||||||
|
|
||||||
### Installing the OpenShift Python Library
|
### Installing the OpenShift Python Library
|
||||||
|
|||||||
@@ -75,3 +75,17 @@ releases:
|
|||||||
fragments:
|
fragments:
|
||||||
- 59-downstream-docs.yml
|
- 59-downstream-docs.yml
|
||||||
release_date: '2020-11-17'
|
release_date: '2020-11-17'
|
||||||
|
1.0.2:
|
||||||
|
changes:
|
||||||
|
minor_changes:
|
||||||
|
- restrict the version of kubernetes.core dependency (https://github.com/ansible-collections/community.okd/pull/66).
|
||||||
|
fragments:
|
||||||
|
- 66-restrict-kubernetes-core-version.yaml
|
||||||
|
release_date: '2021-02-19'
|
||||||
|
1.1.0:
|
||||||
|
changes:
|
||||||
|
minor_changes:
|
||||||
|
- increase the kubernetes.core dependency version number (https://github.com/ansible-collections/community.okd/pull/71).
|
||||||
|
fragments:
|
||||||
|
- 71-bump-kubernetes-core-version.yaml
|
||||||
|
release_date: '2021-02-23'
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
minor_changes:
|
||||||
|
- restrict the version of kubernetes.core dependency (https://github.com/ansible-collections/community.okd/pull/66).
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
minor_changes:
|
||||||
|
- increase the kubernetes.core dependency version number (https://github.com/ansible-collections/community.okd/pull/71).
|
||||||
+6
-4
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash -e
|
#!/bin/bash -eu
|
||||||
|
|
||||||
# Script to dual-home the upstream and downstream Collection in a single repo
|
# Script to dual-home the upstream and downstream Collection in a single repo
|
||||||
#
|
#
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
# - All functions are prefixed with f_ so it's obvious where they come
|
# - All functions are prefixed with f_ so it's obvious where they come
|
||||||
# from when in use throughout the script
|
# from when in use throughout the script
|
||||||
|
|
||||||
DOWNSTREAM_VERSION="1.0.1"
|
DOWNSTREAM_VERSION="1.1.0"
|
||||||
KEEP_DOWNSTREAM_TMPDIR="${KEEP_DOWNSTREAM_TMPDIR:-''}"
|
KEEP_DOWNSTREAM_TMPDIR="${KEEP_DOWNSTREAM_TMPDIR:-''}"
|
||||||
_build_dir=""
|
_build_dir=""
|
||||||
|
|
||||||
@@ -32,6 +32,7 @@ f_text_sub()
|
|||||||
{
|
{
|
||||||
# Switch FQCN and dependent components
|
# Switch FQCN and dependent components
|
||||||
OKD_sed_files="${_build_dir}/README.md ${_build_dir}/CHANGELOG.rst ${_build_dir}/changelogs/config.yaml ${_build_dir}/ci/downstream.sh ${_build_dir}/galaxy.yml"
|
OKD_sed_files="${_build_dir}/README.md ${_build_dir}/CHANGELOG.rst ${_build_dir}/changelogs/config.yaml ${_build_dir}/ci/downstream.sh ${_build_dir}/galaxy.yml"
|
||||||
|
# shellcheck disable=SC2068
|
||||||
for okd_file in ${OKD_sed_files[@]}; do sed -i.bak "s/OKD/OpenShift/g" "${okd_file}"; done
|
for okd_file in ${OKD_sed_files[@]}; do sed -i.bak "s/OKD/OpenShift/g" "${okd_file}"; done
|
||||||
|
|
||||||
sed -i.bak "s/============================/==================================/" "${_build_dir}/CHANGELOG.rst"
|
sed -i.bak "s/============================/==================================/" "${_build_dir}/CHANGELOG.rst"
|
||||||
@@ -155,6 +156,8 @@ f_handle_doc_fragments_workaround()
|
|||||||
do
|
do
|
||||||
local module_py="plugins/modules/${doc_fragment_mod}.py"
|
local module_py="plugins/modules/${doc_fragment_mod}.py"
|
||||||
f_log_info "Processing doc fragments for ${module_py}"
|
f_log_info "Processing doc fragments for ${module_py}"
|
||||||
|
# We need following variable for ansible-doc only
|
||||||
|
# shellcheck disable=SC2097,SC2098
|
||||||
ANSIBLE_COLLECTIONS_PATH="${install_collections_dir}" \
|
ANSIBLE_COLLECTIONS_PATH="${install_collections_dir}" \
|
||||||
ANSIBLE_COLLECTIONS_PATHS="${ANSIBLE_COLLECTIONS_PATH}:${install_collections_dir}" \
|
ANSIBLE_COLLECTIONS_PATHS="${ANSIBLE_COLLECTIONS_PATH}:${install_collections_dir}" \
|
||||||
ansible-doc -j "redhat.openshift.${doc_fragment_mod}" > "${temp_fragments_json}"
|
ansible-doc -j "redhat.openshift.${doc_fragment_mod}" > "${temp_fragments_json}"
|
||||||
@@ -166,9 +169,8 @@ f_handle_doc_fragments_workaround()
|
|||||||
fi
|
fi
|
||||||
"${PYTHON}" "${_start_dir}/ci/downstream_fragments.py" "redhat.openshift.${doc_fragment_mod}" "${temp_fragments_json}"
|
"${PYTHON}" "${_start_dir}/ci/downstream_fragments.py" "redhat.openshift.${doc_fragment_mod}" "${temp_fragments_json}"
|
||||||
sed -n '/STARTREMOVE/q;p' "${module_py}" > "${temp_start}"
|
sed -n '/STARTREMOVE/q;p' "${module_py}" > "${temp_start}"
|
||||||
sed '0,/ENDREMOVE/d' "${module_py}" > "${temp_end}"
|
sed '1,/ENDREMOVE/d' "${module_py}" > "${temp_end}"
|
||||||
cat "${temp_start}" "${rendered_fragments}" "${temp_end}" > "${module_py}"
|
cat "${temp_start}" "${rendered_fragments}" "${temp_end}" > "${module_py}"
|
||||||
cat "${module_py}"
|
|
||||||
done
|
done
|
||||||
rm -f "${rendered_fragments}"
|
rm -f "${rendered_fragments}"
|
||||||
rm -fr "${install_collections_dir}"
|
rm -fr "${install_collections_dir}"
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
|
||||||
|
from __future__ import (absolute_import, division, print_function)
|
||||||
|
__metaclass__ = type
|
||||||
|
|
||||||
import json
|
import json
|
||||||
import yaml
|
|
||||||
import sys
|
import sys
|
||||||
|
import yaml
|
||||||
|
|
||||||
with open("./rendereddocfragments.txt", 'w') as df_fd:
|
with open("./rendereddocfragments.txt", 'w') as df_fd:
|
||||||
with open(sys.argv[2], 'r') as fd:
|
with open(sys.argv[2], 'r') as fd:
|
||||||
@@ -10,6 +13,7 @@ with open("./rendereddocfragments.txt", 'w') as df_fd:
|
|||||||
|
|
||||||
json_docs[sys.argv[1]]['doc'].pop('collection', '')
|
json_docs[sys.argv[1]]['doc'].pop('collection', '')
|
||||||
json_docs[sys.argv[1]]['doc'].pop('filename', '')
|
json_docs[sys.argv[1]]['doc'].pop('filename', '')
|
||||||
|
json_docs[sys.argv[1]]['doc'].pop('has_action', '')
|
||||||
|
|
||||||
df_fd.write("DOCUMENTATION = '''\n")
|
df_fd.write("DOCUMENTATION = '''\n")
|
||||||
df_fd.write(yaml.dump(json_docs[sys.argv[1]]['doc'], default_flow_style=False))
|
df_fd.write(yaml.dump(json_docs[sys.argv[1]]['doc'], default_flow_style=False))
|
||||||
@@ -22,5 +26,3 @@ with open("./rendereddocfragments.txt", 'w') as df_fd:
|
|||||||
df_fd.write("RETURN = '''\n")
|
df_fd.write("RETURN = '''\n")
|
||||||
df_fd.write(yaml.dump(json_docs[sys.argv[1]]['return'], default_flow_style=False))
|
df_fd.write(yaml.dump(json_docs[sys.argv[1]]['return'], default_flow_style=False))
|
||||||
df_fd.write("'''\n\n")
|
df_fd.write("'''\n\n")
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash -eu
|
||||||
|
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
@@ -11,17 +11,18 @@ NAMESPACE=${NAMESPACE:-default}
|
|||||||
# and set the IMAGE_FORMAT environment variable so that it properly
|
# and set the IMAGE_FORMAT environment variable so that it properly
|
||||||
# resolves to your image. For example, quay.io/mynamespace/$component
|
# resolves to your image. For example, quay.io/mynamespace/$component
|
||||||
# would resolve to quay.io/mynamespace/molecule-test-runner
|
# would resolve to quay.io/mynamespace/molecule-test-runner
|
||||||
|
# shellcheck disable=SC2034
|
||||||
component='molecule-test-runner'
|
component='molecule-test-runner'
|
||||||
eval IMAGE=$IMAGE_FORMAT
|
eval IMAGE="$IMAGE_FORMAT"
|
||||||
|
|
||||||
PULL_POLICY=${PULL_POLICY:-IfNotPresent}
|
PULL_POLICY=${PULL_POLICY:-IfNotPresent}
|
||||||
|
|
||||||
if ! oc get namespace $NAMESPACE
|
if ! oc get namespace "$NAMESPACE"
|
||||||
then
|
then
|
||||||
oc create namespace $NAMESPACE
|
oc create namespace "$NAMESPACE"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
oc project $NAMESPACE
|
oc project "$NAMESPACE"
|
||||||
oc adm policy add-cluster-role-to-user cluster-admin -z default
|
oc adm policy add-cluster-role-to-user cluster-admin -z default
|
||||||
oc adm policy who-can create projectrequests
|
oc adm policy who-can create projectrequests
|
||||||
|
|
||||||
@@ -52,7 +53,7 @@ spec:
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
function check_success {
|
function check_success {
|
||||||
oc wait --for=condition=complete job/molecule-integration-test --timeout 5s -n $NAMESPACE \
|
oc wait --for=condition=complete job/molecule-integration-test --timeout 5s -n "$NAMESPACE" \
|
||||||
&& oc logs job/molecule-integration-test \
|
&& oc logs job/molecule-integration-test \
|
||||||
&& echo "Molecule integration tests ran successfully" \
|
&& echo "Molecule integration tests ran successfully" \
|
||||||
&& return 0
|
&& return 0
|
||||||
@@ -60,7 +61,7 @@ function check_success {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function check_failure {
|
function check_failure {
|
||||||
oc wait --for=condition=failed job/molecule-integration-test --timeout 5s -n $NAMESPACE \
|
oc wait --for=condition=failed job/molecule-integration-test --timeout 5s -n "$NAMESPACE" \
|
||||||
&& oc logs job/molecule-integration-test \
|
&& oc logs job/molecule-integration-test \
|
||||||
&& echo "Molecule integration tests failed, see logs for more information..." \
|
&& echo "Molecule integration tests failed, see logs for more information..." \
|
||||||
&& return 0
|
&& return 0
|
||||||
|
|||||||
+2
-2
@@ -5,7 +5,7 @@ authors:
|
|||||||
- willthames (https://github.com/willthames)
|
- willthames (https://github.com/willthames)
|
||||||
- Akasurde (https://github.com/akasurde)
|
- Akasurde (https://github.com/akasurde)
|
||||||
dependencies:
|
dependencies:
|
||||||
kubernetes.core: '>=1.1.1'
|
kubernetes.core: '>=1.2.0,<1.3.0'
|
||||||
description: OKD Collection for Ansible.
|
description: OKD Collection for Ansible.
|
||||||
documentation: ''
|
documentation: ''
|
||||||
homepage: ''
|
homepage: ''
|
||||||
@@ -24,4 +24,4 @@ tags:
|
|||||||
- okd
|
- okd
|
||||||
- cluster
|
- cluster
|
||||||
# Also needs to be updated in the Makefile
|
# Also needs to be updated in the Makefile
|
||||||
version: 1.0.1
|
version: 1.1.0
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ DOCUMENTATION = '''
|
|||||||
- name: K8S_AUTH_EXTRA_ARGS
|
- name: K8S_AUTH_EXTRA_ARGS
|
||||||
oc_kubeconfig:
|
oc_kubeconfig:
|
||||||
description:
|
description:
|
||||||
- Path to a oc config file. Defaults to I(~/.kube/conig)
|
- Path to a oc config file. Defaults to I(~/.kube/config)
|
||||||
default: ''
|
default: ''
|
||||||
vars:
|
vars:
|
||||||
- name: ansible_oc_kubeconfig
|
- name: ansible_oc_kubeconfig
|
||||||
|
|||||||
@@ -134,6 +134,7 @@ options:
|
|||||||
will only work if the same object is passed with state=absent (alternatively, just use state=absent with the name including
|
will only work if the same object is passed with state=absent (alternatively, just use state=absent with the name including
|
||||||
the generated hash and append_hash=no)
|
the generated hash and append_hash=no)
|
||||||
type: bool
|
type: bool
|
||||||
|
default: false
|
||||||
apply:
|
apply:
|
||||||
description:
|
description:
|
||||||
- C(apply) compares the desired resource definition with the previously supplied resource definition,
|
- C(apply) compares the desired resource definition with the previously supplied resource definition,
|
||||||
@@ -141,6 +142,7 @@ options:
|
|||||||
- C(apply) works better with Services than 'force=yes'
|
- C(apply) works better with Services than 'force=yes'
|
||||||
- mutually exclusive with C(merge_type)
|
- mutually exclusive with C(merge_type)
|
||||||
type: bool
|
type: bool
|
||||||
|
default: false
|
||||||
|
|
||||||
requirements:
|
requirements:
|
||||||
- "python >= 2.7"
|
- "python >= 2.7"
|
||||||
|
|||||||
Reference in New Issue
Block a user