Skip to content

Commit 6a06a5b

Browse files
committed
HACKING: Update documentation to reflect changes
- Update documentation to reflect changes - Add note about how to work with the Fedora Staging pipecfg. Signed-off-by: Renata Ravanelli <rravanel@redhat.com>
1 parent b835e06 commit 6a06a5b

File tree

1 file changed

+18
-13
lines changed

1 file changed

+18
-13
lines changed

HACKING.md

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -454,10 +454,21 @@ oc annotate secret/github-coreosbot-token-username-password \
454454
jenkins.io/credentials-description="GitHub coreosbot token as username/password"
455455
```
456456

457-
### [PROD, OPTIONAL] Create additional root CA certificate secret
457+
### Create root CA certificate secret
458458

459-
If an additional root CA certificate is needed, create it as
460-
a secret. This assumes `ca.crt` is a file in the working directory:
459+
The root CA certificate (ca.crt) is required and should be created as a secret.
460+
This example assumes that the ca.crt file is present in your current working
461+
directory.
462+
463+
If you are working in an environment that doesn't need a custom root CA, you
464+
still need to create a dummy configuration file as shown below:
465+
466+
```
467+
cat <<'EOF' > ca.crt
468+
dummy
469+
EOF
470+
```
471+
Then create the secret:
461472

462473
```
463474
oc create secret generic additional-root-ca-cert \
@@ -517,7 +528,6 @@ oc create secret generic krb5-conf \
517528

518529
```
519530
oc new-app --file=manifests/jenkins.yaml \
520-
--param=NAMESPACE=fedora-coreos-pipeline \
521531
--param=STORAGE_CLASS_NAME=ocs-storagecluster-ceph-rbd
522532
```
523533

@@ -532,12 +542,6 @@ using a development cluster, it normally isn't, and you can drop it. For
532542
the Fedora prod cluster, use `ocs-storagecluster-ceph-rbd` as shown
533543
above.
534544

535-
If using an additional root CA certificate, then you will also need to
536-
specify the `AGENT_NAMESPACE` parameter to yours, e.g.:
537-
538-
```
539-
--param=AGENT_NAMESPACE=fedora-coreos-pipeline \
540-
```
541545

542546
Now, create the Jenkins configmap:
543547

@@ -583,11 +587,12 @@ This will create:
583587

584588
1. the Jenkins controller imagestream,
585589
2. the Jenkins agent imagestream,
586-
3. the Jenkins agent BuildConfig (if a root CA cert was provided),
590+
3. the Jenkins agent BuildConfig,
587591
4. the jenkins-config configmap.
588592

589-
If a root CA cert was provided, we need to build the base images that
590-
will bake in the cert in the controller and agent:
593+
Note: If you are working with the Fedora staging pipeline, specify the
594+
`staging` branch for the pipecfg: `--pipecfg
595+
https://github.com/coreos/fedora-coreos-pipeline@staging`.
591596

592597
```
593598
oc start-build --follow jenkins-with-cert

0 commit comments

Comments
 (0)