diff --git a/galaxy/README.md b/galaxy/README.md index b64401b..3967fc4 100644 --- a/galaxy/README.md +++ b/galaxy/README.md @@ -180,7 +180,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 still under active development and there is no support, however, at least the code to create a new instance seems to be implemented. In this procedure, we use [Pulp Operator 0.7.0](https://github.com/pulp/pulp-operator/tree/0.7.0) +This project is still under active development and there is no support, however, at least the code to create a new instance seems to be implemented. In this procedure, we use [Pulp Operator 0.7.1](https://github.com/pulp/pulp-operator/tree/0.7.1) ### Patch K3s @@ -208,20 +208,20 @@ Install specified version of Pulp Operator. cd ~ git clone https://github.com/pulp/pulp-operator.git cd pulp-operator -git checkout 0.7.0 +git checkout 0.7.1 ``` -Export `NAMESPACE` environment variable with `pulp-operator-system`, and then deploy Pulp Operator by `make deploy`. Note that the namespace where Pulp operator will be deployed can be changed by `NAMESPACE` environment variable, but some resources have hard-coded namespace with `pulp-operator-system` that do not work well. +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`. ```bash -export NAMESPACE=pulp-operator-system +export NAMESPACE=galaxy make deploy ``` The Pulp Operator will be deployed to the namespace you specified. ```bash -$ kubectl -n pulp-operator-system get all +$ kubectl -n galaxy get all NAME READY STATUS RESTARTS AGE pod/pulp-operator-controller-manager-9b8644f46-rg2rl 2/2 Running 0 21s @@ -304,23 +304,23 @@ kubectl apply -k pulp To monitor the progress of the deployment, check the logs of `deployments/awx-operator-controller-manager`: ```bash -kubectl -n pulp-operator-system logs -f deployments/pulp-operator-controller-manager -c pulp-manager +kubectl -n galaxy logs -f deployments/pulp-operator-controller-manager -c pulp-manager ``` When the deployment completes successfully, the logs end with: ```txt -$ kubectl -n pulp-operator-system logs -f deployments/pulp-operator-controller-manager -c pulp-manager +$ kubectl -n galaxy logs -f deployments/pulp-operator-controller-manager -c pulp-manager ... ------ Ansible Task Status Event StdOut (pulp.pulpproject.org/v1beta1, Kind=Pulp, galaxy/pulp-operator-system) ----- +----- Ansible Task Status Event StdOut (pulp.pulpproject.org/v1beta1, Kind=Pulp, galaxy/galaxy) ----- PLAY RECAP ********************************************************************* -localhost : ok=75 changed=0 unreachable=0 failed=0 skipped=62 rescued=0 ignored=0 +localhost : ok=75 changed=0 unreachable=0 failed=0 skipped=62 rescued=0 ignored=0 ``` -Required objects has been deployed next to Pulp Operator in `pulp-operator-system` namespace. +Required objects has been deployed next to Pulp Operator in `galaxy` namespace. ```bash -$ kubectl -n pulp-operator-system get pulp,all,ingress,secrets +$ kubectl -n galaxy get pulp,all,ingress,secrets NAME AGE pulp.pulp.pulpproject.org/galaxy 3m58s diff --git a/galaxy/pulp/galaxy.yaml b/galaxy/pulp/galaxy.yaml index a54ea0d..126f7d2 100644 --- a/galaxy/pulp/galaxy.yaml +++ b/galaxy/pulp/galaxy.yaml @@ -4,8 +4,8 @@ metadata: name: galaxy spec: # These parameters are designed for use with: - # - Pulp Operator: 0.7.0 - # https://github.com/pulp/pulp-operator/blob/0.7.0/README.md + # - Pulp Operator: 0.7.1 + # https://github.com/pulp/pulp-operator/blob/0.7.1/README.md # - Galaxy NG: 4.4.1 # https://github.com/ansible/galaxy_ng/tree/4.4.1 diff --git a/galaxy/pulp/kustomization.yaml b/galaxy/pulp/kustomization.yaml index 10c57f8..9f0c2a4 100644 --- a/galaxy/pulp/kustomization.yaml +++ b/galaxy/pulp/kustomization.yaml @@ -1,7 +1,7 @@ --- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: pulp-operator-system +namespace: galaxy generatorOptions: disableNameSuffixHash: true diff --git a/galaxy/pulp/namespace.yaml b/galaxy/pulp/namespace.yaml index e2c1b8e..9fe09cc 100644 --- a/galaxy/pulp/namespace.yaml +++ b/galaxy/pulp/namespace.yaml @@ -2,4 +2,4 @@ apiVersion: v1 kind: Namespace metadata: - name: pulp-operator-system + name: galaxy