Skip to content

Commit 05baec5

Browse files
committed
Merge branch 'fix-helm-chart-install-and-upgrade' into 'main-1.15'
Multiple fixes See merge request ongresinc/stackgres!1632
2 parents c86c9b6 + c8a71d0 commit 05baec5

62 files changed

Lines changed: 1703 additions & 538 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
image: null
22

33
variables:
4-
SG_CI_IMAGE_NAME: "ci:1.29"
4+
SG_CI_IMAGE_NAME: "ci:1.30"
55
BUILDER_IMAGE_NAME: "builder:1.9"
66
SKIP_NATIVE: "false"
77
SKIP_E2E: "false"

doc/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ helm-docs \
5252
)
5353
mv "$(dirname "$0")/../stackgres-k8s/install/helm/stackgres-operator/generated.md" \
5454
"$(dirname "$0")/generated/stackgres-operator.md"
55-
TARGET_PATH="$(dirname "$0")/../doc/content/en/04-administration-guide/01-stackgres-installation/02-installation-via-helm/01-operator-parameters"
55+
TARGET_PATH="$(dirname "$0")/../doc/content/en/04-administration-guide/01-installation/02-installation-via-helm/01-operator-parameters"
5656
INCLUDE_LINE="$(cat "$TARGET_PATH/_index.template.md" | grep -nxF '{{% include "generated/stackgres-operator.md" %}}' | cut -d : -f 1)"
5757
head -n "$((INCLUDE_LINE - 1))" "$TARGET_PATH/_index.template.md" > "$TARGET_PATH/_index.md"
5858
cat "$(dirname "$0")/generated/stackgres-operator.md" >> "$TARGET_PATH/_index.md"

doc/content/en/01-introduction/03-architecture/01-components-of-the-stack/_index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ and integrates as a sidecar offering an auto binding mechanism if Prometheus is
155155
Please take into account that Prometheus is an external dependency and that StackGres expects that you install and configure it separately.
156156

157157
Of course, StackGres provides an option to deploy Prometheus alongside the StackGres Operator
158-
as part of the [Helm chart]({{% relref "04-administration-guide/01-stackgres-installation/02-installation-via-helm" %}})
158+
as part of the [Helm chart]({{% relref "04-administration-guide/01-installation/02-installation-via-helm" %}})
159159
and you can follow the steps described there to set the required parameters so that the monitoring integration works as expected.
160160
Please read and review the steps and notes for a successful installation.
161161

@@ -169,8 +169,8 @@ By default, the [Prometheus Operator](https://github.com/coreos/prometheus-opera
169169

170170
StackGres includes two ways:
171171

172-
- [Automatic integration]({{% relref "/04-administration-guide/01-stackgres-installation/01-pre-requisites/#integrating-pre-existing-grafanas" %}})
173-
- [Manual integration]({{% relref "/04-administration-guide/01-stackgres-installation/01-pre-requisites/#manual-integration" %}})
172+
- [Automatic integration]({{% relref "/04-administration-guide/01-installation/01-pre-requisites/#integrating-pre-existing-grafanas" %}})
173+
- [Manual integration]({{% relref "/04-administration-guide/01-installation/01-pre-requisites/#manual-integration" %}})
174174

175175
Some manual steps are required in order to achieve such integration.
176176

doc/content/en/03-demo-quickstart/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ aliases: [ /demo/quickstart ]
1313
On this page, you will learn how to get started with StackGres.
1414
We will install StackGres on a Kubernetes cluster and create a Postgres instance.
1515

16-
> **NOTE:** To run this demo you need a [K8s environment]({{% relref "04-administration-guide/01-stackgres-installation/01-pre-requisites" %}}) with `kubectl` command already configured to use it. You will also need [`helm`](https://helm.sh/) command version >= `{{% helm-min-version %}}`.
16+
> **NOTE:** To run this demo you need a [K8s environment]({{% relref "04-administration-guide/01-installation/01-pre-requisites" %}}) with `kubectl` command already configured to use it. You will also need [`helm`](https://helm.sh/) command version >= `{{% helm-min-version %}}`.
1717
1818
## Set Up the Helm Repository
1919

@@ -161,4 +161,4 @@ To uninstall all resources generated by this demo, you can run:
161161
helm uninstall --namespace stackgres stackgres-operator
162162
```
163163

164-
Check the [uninstall]({{% relref "/04-administration-guide/999999-uninstall" %}}#using-helm) section for more details.
164+
Check the [uninstall]({{% relref "/04-administration-guide/999999-uninstall" %}}) section for more details.

doc/content/en/04-administration-guide/01-stackgres-installation/01-pre-requisites/01-k8s-environments/01-Rancher RKE/_index.md renamed to doc/content/en/04-administration-guide/01-installation/01-pre-requisites/01-k8s-environments/01-Rancher RKE/_index.md

File renamed without changes.

doc/content/en/04-administration-guide/01-stackgres-installation/01-pre-requisites/01-k8s-environments/02-gke/_index.md renamed to doc/content/en/04-administration-guide/01-installation/01-pre-requisites/01-k8s-environments/02-gke/_index.md

File renamed without changes.

doc/content/en/04-administration-guide/01-stackgres-installation/01-pre-requisites/01-k8s-environments/03-eks/_index.md renamed to doc/content/en/04-administration-guide/01-installation/01-pre-requisites/01-k8s-environments/03-eks/_index.md

File renamed without changes.

doc/content/en/04-administration-guide/01-stackgres-installation/01-pre-requisites/01-k8s-environments/04-do/_index.md renamed to doc/content/en/04-administration-guide/01-installation/01-pre-requisites/01-k8s-environments/04-do/_index.md

File renamed without changes.

doc/content/en/04-administration-guide/01-stackgres-installation/01-pre-requisites/01-k8s-environments/05-oke/_index.md renamed to doc/content/en/04-administration-guide/01-installation/01-pre-requisites/01-k8s-environments/05-oke/_index.md

File renamed without changes.

doc/content/en/04-administration-guide/01-stackgres-installation/01-pre-requisites/01-k8s-environments/06-openshift/_index.md renamed to doc/content/en/04-administration-guide/01-installation/01-pre-requisites/01-k8s-environments/06-openshift/_index.md

File renamed without changes.

0 commit comments

Comments
 (0)