Skip to content

Commit cccd55c

Browse files
Microzuul CIGerrit Code Review
authored andcommitted
Merge "Fixed docs and enabled addition validation. Fixed files filter for doc-check job."
2 parents 109ada1 + 3a57df4 commit cccd55c

14 files changed

Lines changed: 116 additions & 28 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ KUSTOMIZE_VERSION ?= v5.4.3
185185
CONTROLLER_TOOLS_VERSION ?= v0.15.0
186186
OPERATOR_SDK_VERSION ?= 1.36.1
187187
STATICCHECK_VERSION ?= 2025.1.1
188-
MKDOCS_VERSION ?= 1.5.3
188+
MKDOCS_VERSION ?= 1.6.0
189189
SETUP_ENVTEST_VERSION ?= v0.0.0-20240320141353-395cfc7486e6
190190
ZUUL_CLIENT_VERSION ?= 10.0.0
191191

doc/README.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -184,16 +184,14 @@ The current project status is: **Beta**
184184

185185
## Getting Started
186186

187-
* [Installing the Operator ](https://softwarefactory-project.github.io/sf-operator/operator/getting_started/)
188-
* [Deploying Zuul and dependencies with SF-Operator](https://softwarefactory-project.github.io/sf-operator/deployment/getting_started)
187+
* [Deploying Zuul and dependencies with SF-Operator](deployment/getting_started.md)
189188

190189
## Documentation
191190

192-
* [Operator documentation](https://softwarefactory-project.github.io/sf-operator/operator/): for OpenShift cluster administrators, this documentation covers installing SF-Operator and managing the operator's lifecycle.
193-
* [Deployment documentation](https://softwarefactory-project.github.io/sf-operator/deployment/): this documentation covers the essentials for people or teams who intend to deploy and manage Zuul and its dependencies through the SF-Operator.
194-
* [Developer documentation](https://softwarefactory-project.github.io/sf-operator/developer/): this documentation describes how to set up a development and testing environment to develop the SF-Operator.
195-
* [End User documentation](https://softwarefactory-project.github.io/sf-operator/user/): for users of a Software Factory instance. This documentation mostly describes the `Software Factory's config repository` usage (configuration-as-code).
196-
* [CLI reference](https://softwarefactory-project.github.io/sf-operator/reference/cli/)
191+
* [Deployment documentation](deployment/index.md): this documentation covers the essentials for people or teams who intend to deploy and manage Zuul and its dependencies through the SF-Operator.
192+
* [Developer documentation](developer/index.md): this documentation describes how to set up a development and testing environment to develop the SF-Operator.
193+
* [End User documentation](user/index.md): for users of a Software Factory instance. This documentation mostly describes the `Software Factory's config repository` usage (configuration-as-code).
194+
* [CLI reference](reference/cli/index.md)
197195

198196
## Getting Help
199197

@@ -205,7 +203,7 @@ Should you have any questions or feedback concerning the SF-Operator, you can:
205203

206204
## Contributing
207205

208-
Refer to [CONTRIBUTING.md](https://softwarefactory-project.github.io/sf-operator/developer/CONTRIBUTING/).
206+
Refer to [CONTRIBUTING.md](developer/CONTRIBUTING.md).
209207

210208
## License
211209

doc/deployment/config_repository.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
1. [Concept](#concept)
5-
1. [Repository content](#repository-content)
65
1. [Setting up the repository](#setting-up-the-repository)
76
1. [Gerrit](#hosting-on-gerrit)
87
- [Prerequisites](#prerequisites-on-gerrit)

doc/deployment/crds.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This document gives details about the Custom Resource Definitions (CRDs) that th
44

55
The specs are constantly evolving during alpha development and should be considered unstable, but they are the ultimate source of truth for documentation about their properties.
66

7-
1. [SoftwareFactory](#crds)
7+
1. [SoftwareFactory](#softwarefactory)
88

99
## SoftwareFactory
1010

doc/deployment/logging.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ This document describes different ways of handling log collection and aggregatio
55

66
1. [Using kubectl](#using-kubectl)
77
1. [Native Cluster Logging](#native-cluster-logging)
8-
1. [Operator-Managed Log Forwarding](#operator-managed-log-forwarding)
9-
1. [Example: Forwarding Logs to Loki](#example-forwarding-logs-to-loki)
8+
1. [Log Forwarding to a Fluent Bit collector](#log-forwarding-to-a-fluent-bit-collector)
9+
1. [Example: Setting up a simple Fluent Bit + Loki stack for log collection](#example-setting-up-a-simple-fluent-bit-loki-stack-for-log-collection)
1010

1111
## Using kubectl
1212

@@ -21,7 +21,7 @@ If you need to check logs from init containers, crashed containers, batch jobs,
2121
just containers that were destroyed after a configuration change, you will need to rely on
2222
another tool.
2323

24-
### Native Cluster Logging
24+
## Native Cluster Logging
2525

2626
Some clusters may have a built-in log collection infrastructure in place. For example:
2727

doc/reference/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ This release also marks the migration of the sf-operator's CI to https://gateway
169169
### Removed
170170

171171
- cert-manager: dependency removal complete. If you deployed a Software Factory with sf-operator prior to version
172-
v0.0.55, please upgrade to [v0.0.55](#v0055---2025-03-03) first to ensure the proper removal of dangling cert-manager-related resources.
172+
v0.0.55, please upgrade to [v0.0.55](#v0055-2025-03-03) first to ensure the proper removal of dangling cert-manager-related resources.
173173
- The spec `config-location` "base-url" attribute is no longer required.
174174

175175
### Fixed

doc/reference/adr/index.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,7 @@ General information about architectural decision records is available at <https:
3030
1. [Database Agnosticity for SF Deployments](./0009-database-agnosticity.md)
3131
1. [Usage of the upstream zuul-operator](./0010-zuul-operator-usage.md)
3232
1. [Nodepool Builder](./0011-nodepool-builder.md)
33-
1. [CLI overhaul](./0012-CLI-overhaul.md)
33+
1. [CLI overhaul](./0012-CLI-overhaul.md)
34+
1. [Route management](./0015-route-handling.md)
35+
1. [Remove OLM and simplify the CI](./0016-remove-olm-and-simplify-the-ci.md)
36+
1. [Project code hosting change](./0017-sf-operator-code-hosting.md)

doc/reference/api/index.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -662,3 +662,36 @@ _Appears in:_
662662
| `limits` _[LimitsSpec](#limitsspec)_ | Memory/CPU Limit | {map[cpu:500m memory:2Gi]}|
663663

664664

665+
666+
#### SoftwareFactoryStatus
667+
668+
_Type alias for:_ _[BaseStatus](#basestatus)_
669+
670+
SoftwareFactoryStatus defines the observed state of SoftwareFactory. It is a type alias for BaseStatus with no additional fields.
671+
672+
_Appears in:_
673+
- [SoftwareFactory](#softwarefactory)
674+
675+
#### SecretRef
676+
677+
_This type is defined but not currently used in the public API._
678+
679+
SecretRef selects a key of a secret in the pod's namespace.
680+
681+
_Appears in:_
682+
- [Secret](#secret)
683+
684+
| Field | Description | Default Value |
685+
| --- | --- | --- |
686+
| `secretKeyRef` _[Secret](#secret)_ | Selects a key of a secret in the pod's namespace | - |
687+
688+
#### LetsEncryptSpec
689+
690+
_This type is defined but not currently implemented in the operator._
691+
692+
LetsEncryptSpec specifies the Let's Encrypt server configuration. This feature is planned but not yet implemented.
693+
694+
| Field | Description | Default Value |
695+
| --- | --- | --- |
696+
| `server` _[LEServer](#leserver)_ | Specify the Let's Encrypt server. Valid values are: "staging", "prod" | staging |
697+

doc/reference/cli/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ deployments, beyond what can be defined in a custom resource manifest.
3030
1. [Zuul](#zuul)
3131
- [create auth-token](#create-auth-token)
3232
- [create client-config](#create-client-config)
33-
1. [Deploy](#deploy-sf)
33+
1. [Deploy](#deploy)
3434
1. [Version](#version)
3535

3636
## Installing the CLI

doc/user/nodepool_config_repository.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The configuration provided in `nodepool/nodepool.yaml` will be appended to the b
4343
--8<-- "controllers/static/nodepool/generate-config.sh"
4444
```
4545

46-
For each provider used in the Nodepool launcher configuration, Nodepool must be able to find the required connection credentials. Please refer to the deployment documentation about [setting up provider secrets](../deployment/nodepool.md#setting-up-provider-secrets).
46+
For each provider used in the Nodepool launcher configuration, Nodepool must be able to find the required connection credentials. Please refer to the deployment documentation about [setting up provider secrets](../deployment/nodepool.md#setting-up-providers-secrets).
4747

4848
### Use an official cloud image within an OpenStack cloud
4949

@@ -100,7 +100,7 @@ The configuration provided in `nodepool/nodepool-builder.yaml` will be appended
100100

101101
1. See ["What happens during a `config-update` job?"](#configuring-nodepool-launcher) for implementation details.
102102

103-
For each provider used in the Nodepool builder configuration, Nodepool must be able to find the required connection credentials. Please refer to the deployment documentation about [setting up provider secrets](../deployment/nodepool.md#setting-up-provider-secrets).
103+
For each provider used in the Nodepool builder configuration, Nodepool must be able to find the required connection credentials. Please refer to the deployment documentation about [setting up provider secrets](../deployment/nodepool.md#setting-up-providers-secrets).
104104

105105
### disk-image-builder
106106

0 commit comments

Comments
 (0)