Skip to content

Commit

Permalink
Merge branch 'main' into K8SPSMDB-1153-psmdb-1180
Browse files Browse the repository at this point in the history
  • Loading branch information
jvpasinatto authored Nov 14, 2024
2 parents b76a1ba + 0480aad commit 6ce9638
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 7 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/everest-pr-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ jobs:
kubectl wait --for=jsonpath='.status.phase'=Succeeded csv/$csv -n everest --timeout=600s
done
# Check DB engines
kubectl wait --for=jsonpath='.status.status'=installed dbengine/percona-server-mongodb-operator --timeout=600s -n everest
kubectl wait --for=jsonpath='.status.status'=installed dbengine/percona-xtradb-cluster-operator --timeout=600s -n everest
kubectl wait --for=jsonpath='.status.status'=installed dbengine/percona-postgresql-operator --timeout=600s -n everest
# Uninstall
helm uninstall everest -n everest
kubectl delete ns everest
Expand Down
2 changes: 1 addition & 1 deletion charts/everest/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: A cloud-native database platform
version: 0.0.0
appVersion: 0.0.0
type: application
kubeVersion: '>= 1.27.0'
kubeVersion: '>= 1.27.0-0'
maintainers:
- name: mayankshah1607
email: mayank.shah@percona.com
Expand Down
1 change: 1 addition & 0 deletions charts/everest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ The following table shows the configurable parameters of the Percona Everest cha
| operator.image | string | `"perconalab/everest-operator"` | Image to use for the Everest operator container. |
| operator.metricsAddr | string | `"127.0.0.1:8080"` | Metrics address for the operator. |
| operator.resources | object | `{"limits":{"cpu":"500m","memory":"128Mi"},"requests":{"cpu":"5m","memory":"64Mi"}}` | Resources to allocate for the operator container. |
| server.apiRequestsRateLimit | int | `100` | Set the allowed number of requests per second. |
| server.image | string | `"perconalab/everest"` | Image to use for the server container. |
| server.oidc | object | `{}` | OIDC configuration for Everest. |
| server.rbac | string | `"g, admin, role:admin\n"` | RBAC policy for Everest. |
Expand Down
2 changes: 1 addition & 1 deletion charts/everest/charts/everest-db-namespace/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: A sub-chart for provisioning Everest DB namespaces.
type: application
version: 0.0.0
appVersion: 0.0.0
kubeVersion: '>= 1.27.0'
kubeVersion: '>= 1.27.0-0'
dependencies:
- name: common
version: 0.0.*
Expand Down
4 changes: 2 additions & 2 deletions charts/everest/charts/everest-db-namespace/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ A sub-chart for provisioning Everest DB namespaces.

## Requirements

Kubernetes: `>= 1.27.0`
Kubernetes: `>= 1.27.0-0`

| Repository | Name | Version |
|------------|------|---------|
Expand All @@ -29,7 +29,7 @@ Kubernetes: `>= 1.27.0`
| compatibility.openshift | bool | `false` | If set, enable OpenShift compatibility. |
| namespaceOverride | string | `""` | Namespace override. Defaults to the value of .Release.Namespace. |
| olm.namespace | string | `"everest-olm"` | Namespace where OLM is installed in the cluster. |
| pg | bool | `true` | If set, installs the Percona Postgresql Server operator. |
| postgresql | bool | `true` | If set, installs the Percona Postgresql Server operator. |
| psmdb | bool | `true` | If set, installs the Percona Server MongoDB operator. |
| pxc | bool | `true` | If set, installs the Percona XtraDB Cluster operator. |
| telemetry | bool | `true` | If set, enabled sending telemetry information. |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if .Values.pg }}
{{- if .Values.postgresql }}
apiVersion: operators.coreos.com/v1alpha1
kind: Subscription
metadata:
Expand Down
2 changes: 1 addition & 1 deletion charts/everest/charts/everest-db-namespace/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ psmdb: true
# -- If set, installs the Percona XtraDB Cluster operator.
pxc: true
# -- If set, installs the Percona Postgresql Server operator.
pg: true
postgresql: true

olm:
# -- Namespace where OLM is installed in the cluster.
Expand Down
4 changes: 4 additions & 0 deletions charts/everest/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,7 @@ altNames:
{{- end }}
- localhost
{{- end }}

{{- define "everest.versionMetadataURL" -}}
{{- trimSuffix "/" (default "https://check.percona.com" .Values.versionMetadataURL) -}}
{{- end }}
2 changes: 2 additions & 0 deletions charts/everest/templates/everest-operator/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: PERCONA_VERSION_SERVICE_URL
value: {{ printf "%s/%s" (include "everest.versionMetadataURL" .) "versions/v1" }}
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand Down
5 changes: 5 additions & 0 deletions charts/everest/templates/everest-server/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,8 @@ spec:
volumeMounts:
- name: jwt-secret
mountPath: /etc/jwt
env:
{{- if hasKey .Values.server "apiRequestsRateLimit" }}
- name: API_REQUESTS_RATE_LIMIT
value: "{{ .Values.server.apiRequestsRateLimit }}"
{{- end }}
2 changes: 1 addition & 1 deletion charts/everest/templates/hooks.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{{- if .Values.upgrade.preflightChecks }}
{{- include "everest.preUpgradeChecks" (dict "namespace" (include "everest.namespace" .) "version" .Chart.Version "versionMetadataURL" .Values.versionMetadataURL) }}
{{- include "everest.preUpgradeChecks" (dict "namespace" (include "everest.namespace" .) "version" .Chart.Version "versionMetadataURL" (include "everest.versionMetadataURL" .)) }}
{{- end }}
2 changes: 2 additions & 0 deletions charts/everest/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ server:
oidc: {}
# issuerUrl: ""
# clientId: ""
# -- Set the allowed number of requests per second.
apiRequestsRateLimit: 100
operator:
# -- Image to use for the Everest operator container.
image: perconalab/everest-operator
Expand Down

0 comments on commit 6ce9638

Please sign in to comment.