expand/awx-on-k3s
1
0
Fork 0
mirror of https://github.com/Expand-sys/awx-on-k3s synced 2025-12-16 05:52:15 +11:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #235 from kurokobo/galaxy-4.7.0

Browse source 
feat: bump galaxy ng version to 4.7.0
This commit is contained in:
kurokobo 2023-06-24 23:00:21 +09:00 committed by GitHub
commit 2026f9baea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
galaxy/README.md
View file

@ -189,7 +189,7 @@ There is a Kubernetes Operator for Pulp 3 named Pulp Operator.
- [pulp/pulp-operator: Kubernetes Operator for Pulp 3](https://github.com/pulp/pulp-operator)
This project is in alpha stage and under active development. In this guide, we use [Pulp Operator 1.0.0-alpha.6](https://github.com/pulp/pulp-operator/tree/1.0.0-alpha.6).
This project is in alpha stage and under active development. In this guide, we use [Pulp Operator 1.0.0-alpha.7](https://github.com/pulp/pulp-operator/tree/1.0.0-alpha.7).
### Install Pulp Operator
@ -199,7 +199,7 @@ Install specified version of Pulp Operator.
cd ~
git clone https://github.com/pulp/pulp-operator.git
cd pulp-operator
git checkout 1.0.0-alpha.6
git checkout 1.0.0-alpha.7
```
Export the name of the namespace where you want to deploy Pulp Operator as the environment variable `NAMESPACE` and run `make deploy`. The default namespace is `pulp-operator-system`. Note that `make deploy` requires `go` binary by default but you can remove this dependency by small `sed` patch.
@ -309,7 +309,7 @@ When the deployment completes successfully, the logs end with:
$ kubectl -n galaxy logs -f deployments/pulp-operator-controller-manager
...
2006-01-02T15:04:05Z INFO repo_manager/status.go:146 galaxy operator finished execution ...
2006-01-02T15:04:05Z INFO repo_manager/controller.go:324 Operator tasks synced
2006-01-02T15:04:05Z INFO repo_manager/controller.go:339 Operator tasks synced
```
Required objects has been deployed next to Pulp Operator in `galaxy` namespace.
@ -372,7 +372,7 @@ Now your AWX is available at `https://galaxy.example.com/` or the hostname you s
## Configuration and Usage
Basic configuration and usage of Galaxy NG.
Basic configuration and usage of Galaxy NG. Following section is based on Galxy NG 4.7.
### Sync Collections with Public Galaxy
@ -398,9 +398,11 @@ collections:
version: ">=2.1.0"
```
In Galaxy NG, open `Collections` > `Repository Management` > `Remote` and click `Configure` on `community`.
In Galaxy NG, open `Collections` > `Remote` > `community` and click `Edit`.
Select your YAML file in `YAML requirements` and `Save`, then `Sync` and wait to complete.
Select your YAML file in `YAML requirements` and `Save`.
Open `Collections` > `Repositories` > `community`, then `Sync` and wait to complete.
### Publish Your Own Collections to Galaxy NG
@ -472,34 +474,34 @@ ansible-galaxy collection build
Then create `demo` namespace on Galaxy NG, and publish your collection.
Note that you can get appropriate URL for `--server` from `Collections` > `Namespaces` > `View collections` > `CLI Configuration` per collections. Your token is available at `Collections` > `API token management` > `Load token`.
Note that you can get appropriate URL for `--server` from `Collections` > `Namespaces` > `View collections` for `demo` namespace > `CLI configuration` per collections. Your token is available at `Collections` > `API token` > `Load token`.
```bash
ansible-galaxy collection publish \
demo-collection-1.0.0.tar.gz \
--server https://galaxy.example.com/api/galaxy/content/inbound-demo/ \
--server https://galaxy.example.com/api/galaxy/ \
--token d926e******************************3e996 \
-c
```
Once the command succeeded, your collection is stayed at `staging` distribution. Approval by super user on `Collections` > `Approval` page is required to move your collection to `published` distribution.
Once the command succeeded, your collection is stayed at `staging` repository. Approval by super user on `Collections` > `Approval` page is required to move your collection to `published` repository.
Optionally, this approval process can be disabled by adding `galaxy_require_content_approval: "False"` in your `settings.py`.
### Install Collections Locally from Galaxy NG
Modify your `ansible.cfg` to specify which Galaxy Instance will be used in which order. Note that you can get appropriate configuration from `Collections` > `Repository Management` > `Local` > `CLI configuration` per distributions. Your token is available at `Collections` > `API Token`.
Modify your `ansible.cfg` to specify which Galaxy Instance will be used in which order. Note that you can get appropriate configuration from `Collections` > `Repositories` > repository name (`community` or `published` for example) > `Copy CLI configuration` per repositories. Your token is available at `Collections` > `API token`.
```init
[galaxy]
server_list = published_repo, community_repo
[galaxy_server.published_repo]
url=https://galaxy.example.com/api/galaxy/content/published/
url=https://galaxy.example.com/api/galaxy/
token=d926e******************************3e996
[galaxy_server.community_repo]
url=https://galaxy.example.com/api/galaxy/content/community/
url=https://galaxy.example.com/api/galaxy/
token=d926e******************************3e996
```
@ -558,12 +560,12 @@ To use your Collections on your Galaxy NG through AWX, some tasks are required b
1. Store your **Token** and **URL** for specific **Organization** in AWX
- Add credential with type `Ansible Galaxy/Automation Hub API Token` with your Token and Galaxy Server URL.
- You can get appropriate URL from `Collections` > `Repository Management` > `Local` > `CLI configuration` per distributions on Galaxy NG.
- Your token is available at `Collections` > `API Token` on Galaxy NG.
1. Enable your credential in **Organization**
- You can get appropriate URL from `Collections` > `Repositories` > repository name (`community` or `published` for example) > `Copy CLI configuration` on Galaxy NG.
- Your token is available at `Collections` > `API token` on Galaxy NG.
2. Enable your credential in **Organization**
- In `Edit` screen for `Organization` that will use your Galaxy NG, enable your credential in `Galaxy Credentials`.
- You can change the order of credentials to set precedence for the sync and lookup of the content.
1. Ignore SSL Certificate Verification
3. Ignore SSL Certificate Verification
- Enable `Ignore Ansible Galaxy SSL Certificate Verification` in `Settings` > `Jobs` > `Jobs settings`
Then create files to test collection.

13
galaxy/pulp/galaxy.yaml
View file

@ -4,17 +4,17 @@ metadata:
name: galaxy
spec:
# These parameters are designed for use with:
# - Pulp Operator: 1.0.0-alpha.6
# https://github.com/pulp/pulp-operator/blob/1.0.0-alpha.6/README.md
# - Galaxy NG: 4.6.3
# https://github.com/ansible/galaxy_ng/tree/4.6.3
# - Pulp Operator: 1.0.0-alpha.7
# https://github.com/pulp/pulp-operator/blob/1.0.0-alpha.7/README.md
# - Galaxy NG: 4.7.1
# https://github.com/ansible/galaxy_ng/tree/4.7.1
deployment_type: galaxy
image: quay.io/pulp/galaxy
image_version: 4.6.3
image_version: 4.7.1
image_web: quay.io/pulp/galaxy-web
image_web_version: 4.6.3
image_web_version: 4.7.1
admin_password_secret: galaxy-admin-password
@ -30,6 +30,7 @@ spec:
pulp_settings:
TOKEN_AUTH_DISABLED: "True"
GALAXY_FEATURE_FLAGS__ai_deny_index: "True"
api:
replicas: 1