Skip to content

Commit d7fe423

Browse files
committed
More doc link fixes
1 parent a1a0d02 commit d7fe423

File tree

15 files changed

+48
-65
lines changed

15 files changed

+48
-65
lines changed

api/v1/coherence_types.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -386,16 +386,16 @@ type CloudNativeBuildPackSpec struct {
386386
// ----- CoherenceSpec struct -----------------------------------------------
387387

388388
// CoherenceSpec is the section of the CRD configures settings specific to Coherence.
389-
// +coh:doc=coherence_settings/010_overview.adoc,Coherence Configuration
389+
// +coh:doc=docs/coherence_settings/010_overview.adoc,Coherence Configuration
390390
// +k8s:openapi-gen=true
391391
type CoherenceSpec struct {
392392
// CacheConfig is the name of the cache configuration file to use
393-
// +coh:doc=coherence_settings/030_cache_config.adoc,Configure Cache Config File
393+
// +coh:doc=docs/coherence_settings/030_cache_config.adoc,Configure Cache Config File
394394
// +optional
395395
CacheConfig *string `json:"cacheConfig,omitempty"`
396396
// OverrideConfig is name of the Coherence operational configuration override file,
397397
// the default is tangosol-coherence-override.xml
398-
// +coh:doc=coherence_settings/040_override_file.adoc,Configure Operational Config File
398+
// +coh:doc=docs/coherence_settings/040_override_file.adoc,Configure Operational Config File
399399
// +optional
400400
OverrideConfig *string `json:"overrideConfig,omitempty"`
401401
// A boolean flag indicating whether members of this deployment are storage enabled.
@@ -404,26 +404,26 @@ type CoherenceSpec struct {
404404
// This flag is also used to configure the ScalingPolicy value if a value is not specified. If the
405405
// StorageEnabled field is not specified or is true the scaling will be safe, if StorageEnabled is
406406
// set to false scaling will be parallel.
407-
// +coh:doc=coherence_settings/050_storage_enabled.adoc,Configure Storage Enabled
407+
// +coh:doc=docs/coherence_settings/050_storage_enabled.adoc,Configure Storage Enabled
408408
// +optional
409409
StorageEnabled *bool `json:"storageEnabled,omitempty"`
410410
// Persistence values configure the on-disc data persistence settings.
411411
// The bool Enabled enables or disabled on disc persistence of data.
412-
// +coh:doc=coherence_settings/080_persistence.adoc,Configure Persistence
412+
// +coh:doc=docs/coherence_settings/080_persistence.adoc,Configure Persistence
413413
// +optional
414414
Persistence *PersistenceSpec `json:"persistence,omitempty"`
415415
// The Coherence log level, default being 5 (info level).
416-
// +coh:doc=coherence_settings/060_log_level.adoc,Configure Coherence log level
416+
// +coh:doc=docs/coherence_settings/060_log_level.adoc,Configure Coherence log level
417417
// +optional
418418
LogLevel *int32 `json:"logLevel,omitempty"`
419419
// Management configures Coherence management over REST
420420
// Note: Coherence management over REST will is available in Coherence version >= 12.2.1.4.
421-
// +coh:doc=management_and_diagnostics/010_overview.adoc,Management & Diagnostics
421+
// +coh:doc=docs/management_and_diagnostics/010_overview.adoc,Management & Diagnostics
422422
// +optional
423423
Management *PortSpecWithSSL `json:"management,omitempty"`
424424
// Metrics configures Coherence metrics publishing
425425
// Note: Coherence metrics publishing will is available in Coherence version >= 12.2.1.4.
426-
// +coh:doc=metrics/010_overview.adoc,Metrics
426+
// +coh:doc=docs/metrics/010_overview.adoc,Metrics
427427
// +optional
428428
Metrics *PortSpecWithSSL `json:"metrics,omitempty"`
429429
// Tracing is used to configure Coherence distributed tracing functionality.
@@ -442,13 +442,13 @@ type CoherenceSpec struct {
442442
// +optional
443443
AllowEndangeredForStatusHA []string `json:"allowEndangeredForStatusHA,omitempty"`
444444
// Exclude members of this deployment from being part of the cluster's WKA list.
445-
// +coh:doc=coherence_settings/070_wka.adoc,Well Known Addressing
445+
// +coh:doc=docs/coherence_settings/070_wka.adoc,Well Known Addressing
446446
// +optional
447447
ExcludeFromWKA *bool `json:"excludeFromWKA,omitempty"`
448448
// Specify an existing Coherence deployment to be used for WKA.
449449
// If an existing deployment is to be used for WKA the ExcludeFromWKA is
450450
// implicitly set to true.
451-
// +coh:doc=coherence_settings/070_wka.adoc,Well Known Addressing
451+
// +coh:doc=docs/coherence_settings/070_wka.adoc,Well Known Addressing
452452
// +optional
453453
WKA *CoherenceWKASpec `json:"wka,omitempty"`
454454
// Certain features rely on a version check prior to starting the server, e.g. metrics requires >= 12.2.1.4.
@@ -2558,7 +2558,7 @@ type StartQuorumStatus struct {
25582558

25592559
// ConfigMapVolumeSpec represents a ConfigMap that will be added to the deployment's Pods as an
25602560
// additional Volume and as a VolumeMount in the containers.
2561-
// +coh:doc=misc_pod_settings/050_configmap_volumes.adoc,Add ConfigMap Volumes
2561+
// +coh:doc=docs/misc_pod_settings/050_configmap_volumes.adoc,Add ConfigMap Volumes
25622562
// +k8s:openapi-gen=true
25632563
type ConfigMapVolumeSpec struct {
25642564
// The name of the ConfigMap to mount.
@@ -2680,7 +2680,7 @@ func (in *ConfigMapVolumeSpec) AddVolumeMounts(c *corev1.Container) {
26802680

26812681
// SecretVolumeSpec represents a Secret that will be added to the deployment's Pods as an
26822682
// additional Volume and as a VolumeMount in the containers.
2683-
// +coh:doc=misc_pod_settings/020_secret_volumes.adoc,Add Secret Volumes
2683+
// +coh:doc=docs/misc_pod_settings/020_secret_volumes.adoc,Add Secret Volumes
26842684
// +k8s:openapi-gen=true
26852685
type SecretVolumeSpec struct {
26862686
// The name of the Secret to mount.

api/v1/coherenceresourcespec_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,14 @@ type CoherenceResourceSpec struct {
122122
// A list of ConfigMaps to add as volumes.
123123
// Each entry in the list will be added as a ConfigMap Volume to the deployment's
124124
// Pods and as a VolumeMount to all the containers and init-containers in the Pod.
125-
// +coh:doc=misc_pod_settings/050_configmap_volumes.adoc,Add ConfigMap Volumes
125+
// +coh:doc=docs/misc_pod_settings/050_configmap_volumes.adoc,Add ConfigMap Volumes
126126
// +listType=map
127127
// +listMapKey=name
128128
ConfigMapVolumes []ConfigMapVolumeSpec `json:"configMapVolumes,omitempty"`
129129
// A list of Secrets to add as volumes.
130130
// Each entry in the list will be added as a Secret Volume to the deployment's
131131
// Pods and as a VolumeMount to all the containers and init-containers in the Pod.
132-
// +coh:doc=misc_pod_settings/020_secret_volumes.adoc,Add Secret Volumes
132+
// +coh:doc=docs/misc_pod_settings/020_secret_volumes.adoc,Add Secret Volumes
133133
// +listType=map
134134
// +listMapKey=name
135135
SecretVolumes []SecretVolumeSpec `json:"secretVolumes,omitempty"`

docs/about/04_coherence_spec.adoc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -302,9 +302,9 @@ see: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotatio
302302
m| initContainers | List of additional initialization containers to add to the deployment's Pod. More info: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ m| []https://{k8s-doc-link}/#container-v1-core[corev1.Container] | false
303303
m| sideCars | List of additional side-car containers to add to the deployment's Pod. m| []https://{k8s-doc-link}/#container-v1-core[corev1.Container] | false
304304
m| configMapVolumes | A list of ConfigMaps to add as volumes. Each entry in the list will be added as a ConfigMap Volume to the deployment's Pods and as a VolumeMount to all the containers and init-containers in the Pod. +
305-
see: <<misc_pod_settings/050_configmap_volumes.adoc,Add ConfigMap Volumes>> m| []<<ConfigMapVolumeSpec,ConfigMapVolumeSpec>> | false
305+
see: <<docs/misc_pod_settings/050_configmap_volumes.adoc,Add ConfigMap Volumes>> m| []<<ConfigMapVolumeSpec,ConfigMapVolumeSpec>> | false
306306
m| secretVolumes | A list of Secrets to add as volumes. Each entry in the list will be added as a Secret Volume to the deployment's Pods and as a VolumeMount to all the containers and init-containers in the Pod. +
307-
see: <<misc_pod_settings/020_secret_volumes.adoc,Add Secret Volumes>> m| []<<SecretVolumeSpec,SecretVolumeSpec>> | false
307+
see: <<docs/misc_pod_settings/020_secret_volumes.adoc,Add Secret Volumes>> m| []<<SecretVolumeSpec,SecretVolumeSpec>> | false
308308
m| volumes | Volumes defines extra volume mappings that will be added to the Coherence Pod. +
309309
The content of this yaml should match the normal k8s volumes section of a Pod definition + +
310310
as described in https://kubernetes.io/docs/concepts/storage/volumes/ + m| []https://{k8s-doc-link}/#volume-v1-core[corev1.Volume] | false
@@ -388,31 +388,31 @@ m| jobProbes | &#160; m| []<<CoherenceJobProbeStatus,CoherenceJobProbeStatus>> |
388388
=== CoherenceSpec
389389
390390
CoherenceSpec is the section of the CRD configures settings specific to Coherence. +
391-
see: <<coherence_settings/010_overview.adoc,Coherence Configuration>>
391+
see: <<docs/coherence_settings/010_overview.adoc,Coherence Configuration>>
392392
393393
[cols="1,10,1,1"options="header"]
394394
|===
395395
| Field | Description | Type | Required
396396
m| cacheConfig | CacheConfig is the name of the cache configuration file to use +
397-
see: <<coherence_settings/030_cache_config.adoc,Configure Cache Config File>> m| &#42;string | false
397+
see: <<docs/coherence_settings/030_cache_config.adoc,Configure Cache Config File>> m| &#42;string | false
398398
m| overrideConfig | OverrideConfig is name of the Coherence operational configuration override file, the default is tangosol-coherence-override.xml +
399-
see: <<coherence_settings/040_override_file.adoc,Configure Operational Config File>> m| &#42;string | false
399+
see: <<docs/coherence_settings/040_override_file.adoc,Configure Operational Config File>> m| &#42;string | false
400400
m| storageEnabled | A boolean flag indicating whether members of this deployment are storage enabled. This value will set the corresponding coherence.distributed.localstorage System property. If not specified the default value is true. This flag is also used to configure the ScalingPolicy value if a value is not specified. If the StorageEnabled field is not specified or is true the scaling will be safe, if StorageEnabled is set to false scaling will be parallel. +
401-
see: <<coherence_settings/050_storage_enabled.adoc,Configure Storage Enabled>> m| &#42;bool | false
401+
see: <<docs/coherence_settings/050_storage_enabled.adoc,Configure Storage Enabled>> m| &#42;bool | false
402402
m| persistence | Persistence values configure the on-disc data persistence settings. The bool Enabled enables or disabled on disc persistence of data. +
403-
see: <<coherence_settings/080_persistence.adoc,Configure Persistence>> m| &#42;<<PersistenceSpec,PersistenceSpec>> | false
403+
see: <<docs/coherence_settings/080_persistence.adoc,Configure Persistence>> m| &#42;<<PersistenceSpec,PersistenceSpec>> | false
404404
m| logLevel | The Coherence log level, default being 5 (info level). +
405-
see: <<coherence_settings/060_log_level.adoc,Configure Coherence log level>> m| &#42;int32 | false
405+
see: <<docs/coherence_settings/060_log_level.adoc,Configure Coherence log level>> m| &#42;int32 | false
406406
m| management | Management configures Coherence management over REST Note: Coherence management over REST will is available in Coherence version >= 12.2.1.4. +
407-
see: <<management_and_diagnostics/010_overview.adoc,Management & Diagnostics>> m| &#42;<<PortSpecWithSSL,PortSpecWithSSL>> | false
407+
see: <<docs/management_and_diagnostics/010_overview.adoc,Management & Diagnostics>> m| &#42;<<PortSpecWithSSL,PortSpecWithSSL>> | false
408408
m| metrics | Metrics configures Coherence metrics publishing Note: Coherence metrics publishing will is available in Coherence version >= 12.2.1.4. +
409-
see: <<metrics/010_overview.adoc,Metrics>> m| &#42;<<PortSpecWithSSL,PortSpecWithSSL>> | false
409+
see: <<docs/metrics/010_overview.adoc,Metrics>> m| &#42;<<PortSpecWithSSL,PortSpecWithSSL>> | false
410410
m| tracing | Tracing is used to configure Coherence distributed tracing functionality. m| &#42;<<CoherenceTracingSpec,CoherenceTracingSpec>> | false
411411
m| allowEndangeredForStatusHA | AllowEndangeredForStatusHA is a list of Coherence partitioned cache service names that are allowed to be in an endangered state when testing for StatusHA. Instances where a StatusHA check is performed include the readiness probe and when scaling a deployment. This field would not typically be used except in cases where a cache service is configured with a backup count greater than zero but it does not matter if caches in those services loose data due to member departure. Normally, such cache services would have a backup count of zero, which would automatically excluded them from the StatusHA check. m| []string | false
412412
m| excludeFromWKA | Exclude members of this deployment from being part of the cluster's WKA list. +
413-
see: <<coherence_settings/070_wka.adoc,Well Known Addressing>> m| &#42;bool | false
413+
see: <<docs/coherence_settings/070_wka.adoc,Well Known Addressing>> m| &#42;bool | false
414414
m| wka | Specify an existing Coherence deployment to be used for WKA. If an existing deployment is to be used for WKA the ExcludeFromWKA is implicitly set to true. +
415-
see: <<coherence_settings/070_wka.adoc,Well Known Addressing>> m| &#42;<<CoherenceWKASpec,CoherenceWKASpec>> | false
415+
see: <<docs/coherence_settings/070_wka.adoc,Well Known Addressing>> m| &#42;<<CoherenceWKASpec,CoherenceWKASpec>> | false
416416
m| skipVersionCheck | Certain features rely on a version check prior to starting the server, e.g. metrics requires >= 12.2.1.4. The version check relies on the ability of the start script to find coherence.jar but if due to how the image has been built this check is failing then setting this flag to true will skip version checking and assume that the latest coherence.jar is being used. m| &#42;bool | false
417417
m| enableIpMonitor | Enables the Coherence IP Monitor feature. The Operator disables the IP Monitor by default. m| &#42;bool | false
418418
m| localPort | LocalPort sets the Coherence unicast port. When manually configuring unicast ports, a single port is specified and the second port is automatically selected. If either of the ports are not available, then the default behavior is to select the next available port. For example, if port 9000 is configured for the first port (port1) and it is not available, then the next available port is automatically selected. The second port (port2) is automatically opened and defaults to the next available port after port1 (port1 + 1 if available). m| &#42;int32 | false
@@ -515,7 +515,7 @@ m| ipFamily | IPFamily is the IP family to use for the WKA service (and also the
515515
=== ConfigMapVolumeSpec
516516
517517
ConfigMapVolumeSpec represents a ConfigMap that will be added to the deployment's Pods as an additional Volume and as a VolumeMount in the containers. +
518-
see: <<misc_pod_settings/050_configmap_volumes.adoc,Add ConfigMap Volumes>>
518+
see: <<docs/misc_pod_settings/050_configmap_volumes.adoc,Add ConfigMap Volumes>>
519519
520520
[cols="1,10,1,1"options="header"]
521521
|===
@@ -957,7 +957,7 @@ m| probe | The probe to use to determine whether a deployment is Phase HA. If no
957957
=== SecretVolumeSpec
958958
959959
SecretVolumeSpec represents a Secret that will be added to the deployment's Pods as an additional Volume and as a VolumeMount in the containers. +
960-
see: <<misc_pod_settings/020_secret_volumes.adoc,Add Secret Volumes>>
960+
see: <<docs/misc_pod_settings/020_secret_volumes.adoc,Add Secret Volumes>>
961961
962962
[cols="1,10,1,1"options="header"]
963963
|===

docs/about/05_upgrade.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@ In Operator v2 there were multiple images defined, one for Coherence and one use
8181
Because of the application changes described only a single image now needs to be specified in the `image` field
8282
of the `CRD` spec.
8383
84-
See the <<applications/010_overview.adoc,Applications>> section of the doecumentation for more details.
84+
See the <<docs/applications/010_overview.adoc,Applications>> section of the doecumentation for more details.
8585
8686
8787
== CRD Differences
8888
8989
A lot of the fields in the `Coherence` CRD are the same as when defining a role in version 2.
9090
Whilst a number of new fields and features have been added in version 3, a handful of fields have moved,
9191
and a small number, that no longer made sense, have been removed.
92-
The <<about/04_coherence_spec.adoc,Coherence Spec>> page documents the full `Coherence` CRD, so it is
92+
The <<docs/about/04_coherence_spec.adoc,Coherence Spec>> page documents the full `Coherence` CRD, so it is
9393
simple to locate where a field might have moved to.
9494
9595
@@ -100,7 +100,7 @@ There are a lot of different ways to configure Fluentd and making the Operator a
100100
too much of a head-ache to do in a backwards compatible way.
101101
If a Fluentd side-car is required it can just be added to the `Coherence` resource spec as an additional container,
102102
so there is no limitation on the Fluentd configuration.
103-
See the <<logging/010_overview.adoc,Logging documentation>> for more examples.
103+
See the <<docs/logging/010_overview.adoc,Logging documentation>> for more examples.
104104
105105
== Prometheus and Elasticsearch
106106

docs/installation/001_installation.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ See the <<examples/400_Istio/README.adoc,Istio example>> for more details.
4444
4545
There are a number of ways to install the Coherence Operator.
4646
47-
* <<installation/011_install_manifests.adoc,Install using the yaml manifest file>>
48-
* <<installation/012_install_helm.adoc,Install using Helm>>
49-
* <<installation/013_install_kustomize.adoc,Install using Kustomize>>
50-
* <<installation/014_install_openshift.adoc,Install on OpenShift>>
51-
* <<installation/015_install_olm.adoc,Install using the Operator Lifecycle Manager (OLM)>>
52-
* <<installation/016_install_tanzu.adoc,Install on VMWare Tanzu>>
47+
* <<docs/installation/011_install_manifests.adoc,Install using the yaml manifest file>>
48+
* <<docs/installation/012_install_helm.adoc,Install using Helm>>
49+
* <<docs/installation/013_install_kustomize.adoc,Install using Kustomize>>
50+
* <<docs/installation/014_install_openshift.adoc,Install on OpenShift>>
51+
* <<docs/installation/015_install_olm.adoc,Install using the Operator Lifecycle Manager (OLM)>>
52+
* <<docs/installation/016_install_tanzu.adoc,Install on VMWare Tanzu>>
5353
5454
5555
[#ha]

docs/jvm/040_gc.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,6 @@ spec:
105105
In the example above the `-XX:MaxGCPauseMillis=200` JVM argument will be added to the command line.
106106
107107
NOTE: The `jvm.gc.args` field will add the provided arguments to the end of the command line exactly as they
108-
are in the args list. This field provides the same functionality as <<jvm/030_jvm_args.adoc,JVM Args>>
108+
are in the args list. This field provides the same functionality as <<docs/jvm/030_jvm_args.adoc,JVM Args>>
109109
but sometimes it might be useful to be able to separate the two gorups of arguments in the CRD spec.
110110

docs/metrics/020_metrics.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ spec:
8181
<2> To expose metrics via a `Service` it is added to the `ports` list.
8282
The `metrics` port is a special case where the `port` number is optional so in this case metrics
8383
will bind to the default port `9612`.
84-
(see <<ports/020_container_ports.adoc,Exposing Ports>> for details)
84+
(see <<docs/ports/020_container_ports.adoc,Exposing Ports>> for details)
8585
8686
8787
==== Expose Metrics on a Different Port
@@ -172,4 +172,4 @@ spec:
172172
----
173173
<1> The `serviceMonitor.enabled` field is set to `true` for the `metrics` port.
174174
175-
See <<ports/040_servicemonitors.adoc,Exposing ports and Services - Service Monitors>> documentation for more details.
175+
See <<docs/ports/040_servicemonitors.adoc,Exposing ports and Services - Service Monitors>> documentation for more details.

docs/metrics/030_importing.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
== Importing the Coherence Dashboards
1515
1616
The Coherence Operator provides a set of dashboards for Coherence that may be imported into Grafana.
17-
The Coherence dashboards are explained in detail on the <<040_dashboards.adoc,Coherence Grafana Dashboards>> page.
17+
The Coherence dashboards are explained in detail on the <<docs/metrics/040_dashboards.adoc,Coherence Grafana Dashboards>> page.
1818
1919
There are two ways to obtain the dashboards:
2020

docs/metrics/050_ssl.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,5 @@ and password files from.
6464
The various files and keystores referred to in the configuration above can be any location accessible in the image
6565
used by the `coherence` container in the deployment's `Pods`. Typically, for things such as SSL keys and certs,
6666
these would be provided by obtained from `Secrets` loaded as additional `Pod` `Volumes`.
67-
See <<other/060_secret_volumes.adoc,Add Secrets Volumes>> for the documentation on how to specify
67+
See <<docs/other/060_secret_volumes.adoc,Add Secrets Volumes>> for the documentation on how to specify
6868
secrets as additional volumes.

docs/ports/020_container_ports.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ Prometheus `ServiceMonitor` to be created for the port if that port is to expose
9292
9393
See also:
9494
95-
* <<ports/030_services.adoc,Configure Services for Ports>>
96-
* <<ports/040_servicemonitors.adoc,Prometheus ServiceMonitors>>
95+
* <<docs/ports/030_services.adoc,Configure Services for Ports>>
96+
* <<docs/ports/040_servicemonitors.adoc,Prometheus ServiceMonitors>>
9797
9898
9999
=== Metrics & Management Ports

0 commit comments

Comments
 (0)