K8SPG-391 openshift certification #556

nmarukovich · 2023-10-30T07:55:45Z

CHANGE DESCRIPTION

Problem:
Short explanation of the problem.

Cause:
Short explanation of the root cause of the issue if applicable.

Solution:
Short explanation of the solution we are providing with this PR.

CHECKLIST

Jira

Is the Jira ticket created and referenced properly?
Does the Jira ticket have the proper statuses for documentation (Needs Doc) and QA (Needs QA)?
Does the Jira ticket link to the proper milestone (Fix Version field)?

Tests

Is an E2E test/test case added for the new feature/change?
Are unit tests added where appropriate?

Config/Logging/Testability

Are all needed new/changed options added to default YAML files?
Are the manifests (crd/bundle) regenerated if needed?
Did we add proper logging messages for operator actions?
Did we ensure compatibility with the previous version or cluster upgrade process?
Does the change support oldest and newest supported PG version?
Does the change support oldest and newest supported Kubernetes version?

…a/percona-postgresql-operator into K8SPG-391_openshift_certification

e2e-tests/functions

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

…a/percona-postgresql-operator into K8SPG-391_openshift_certification

ptankov · 2023-10-31T17:59:31Z

e2e-tests/functions

 create_namespace() {
 	local namespace=$1
-	if [[ ${CLEAN_NAMESPACE} == 1 ]]; then
+	if [ -n "$OPENSHIFT" ]; then


Double square brackets [[ ]] are generally preferable over single square brackets [ ] in Bash. Would you consider, for example, using
if [[ $OPENSHIFT ]]; then
here?
Also, the quotes around "$OPENSHIFT" are superfluous.

O! Nice! I will fix it tomorrow.

ptankov · 2023-10-31T18:11:29Z

e2e-tests/functions

@@ -5,14 +5,33 @@ ROOT_REPO=${ROOT_REPO:-$(realpath ../../..)}
 source "${ROOT_REPO}/e2e-tests/vars.sh"
 test_name=$(basename "$(pwd)")

+if oc get projects; then


did you mean
if oc get projects > /dev/null 2>&1; then

ptankov · 2023-10-31T18:23:28Z

e2e-tests/functions

 create_namespace() {
 	local namespace=$1
-	if [[ ${CLEAN_NAMESPACE} == 1 ]]; then
+	if [ -n "$OPENSHIFT" ]; then
+		if [ -n "$OPERATOR_NS" -a $(oc get project "$OPERATOR_NS" -o json | jq -r '.metadata.name') ]; then


same as above for the double square brackets

also, are you sure this is the comparison you actually mean? Did you mean:

set -o pipefail if [[ "$OPERATOR_NS" ]] && oc get project "$OPERATOR_S" -o json > /dev/null 2>&1 | jq -r '.metadata.name' > /dev/null 2>&1; then

ptankov · 2023-10-31T18:25:00Z

e2e-tests/functions

@@ -240,8 +259,23 @@ wait_for_delete() {
 deploy_pmm_server() {
 	local platform=kubernetes
 	helm uninstall -n "${NAMESPACE}" pmm || :
-	helm install monitoring -n "${NAMESPACE}" --set imageTag=${IMAGE_PMM_SERVER#*:} --set service.type="LoadBalancer" \
-		--set imageRepo=${IMAGE_PMM_SERVER%:*} --set platform="${platform}" "https://percona-charts.storage.googleapis.com/pmm-server-${PMM_SERVER_VERSION}.tgz"
+	if [ ! -z "$OPENSHIFT" ]; then


same as above about [[

ptankov · 2023-10-31T18:26:47Z

e2e-tests/functions

+		helm install monitoring --set imageTag=${IMAGE_PMM_SERVER#*:} --set imageRepo=${IMAGE_PMM_SERVER%:*} --set platform=$platform --set sa=pmm-server --set supresshttp2=false https://percona-charts.storage.googleapis.com/pmm-server-${PMM_SERVER_VERSION}.tgz -n "${NAMESPACE}"
+	else
+		helm install monitoring -n "${NAMESPACE}" --set imageTag=${IMAGE_PMM_SERVER#*:} --set service.type="LoadBalancer" \
+			--set imageRepo=${IMAGE_PMM_SERVER%:*} --set platform="${platform}" "https://percona-charts.storage.googleapis.com/pmm-server-${PMM_SERVER_VERSION}.tgz"


in this case, what is the value of $platform?

Where is the variable $platform initialized as "kubernetes"? I couldn't find that.

ptankov · 2023-10-31T18:28:14Z

e2e-tests/functions

-		--set imageRepo=${IMAGE_PMM_SERVER%:*} --set platform="${platform}" "https://percona-charts.storage.googleapis.com/pmm-server-${PMM_SERVER_VERSION}.tgz"
+	if [ ! -z "$OPENSHIFT" ]; then
+		platform=openshift
+		oc create sa pmm-server -n "${NAMESPACE}"


Generally, with some very few exceptions, there is no need to use ${VARIABLE} in Bash. Just $VARIABLE is enough, avoids clutter and makes the code easier to read.

e2e-tests/functions

ptankov · 2023-11-01T07:58:36Z

e2e-tests/functions

 create_namespace() {
 	local namespace=$1
-	if [[ ${CLEAN_NAMESPACE} == 1 ]]; then
+	if [[ -n $OPENSHIFT ]]; then


-n is not needed here, just if [[ $OPENSHIFT ]]; then is perfectly fine

ptankov · 2023-11-01T08:02:27Z

e2e-tests/functions

 create_namespace() {
 	local namespace=$1
-	if [[ ${CLEAN_NAMESPACE} == 1 ]]; then
+	if [[ -n $OPENSHIFT ]]; then
+		if [[ -n $OPERATOR_NS && $(oc get project "$OPERATOR_NS" -o json | jq -r '.metadata.name') ]]; then


-n is not needed here just like above, also, I think the second part of the comparrison must be outside of the square brackets, like this:
if [[ "$OPERATOR_NS" ]] && oc get project "$OPERATOR_S" -o json > /dev/null 2>&1 | jq -r '.metadata.name' > /dev/null 2>&1; then
because the command oc get projec ... would return some string which will always be true

ptankov · 2023-11-01T08:02:56Z

e2e-tests/functions

@@ -240,8 +259,23 @@ wait_for_delete() {
 deploy_pmm_server() {
 	local platform=kubernetes
 	helm uninstall -n "${NAMESPACE}" pmm || :
-	helm install monitoring -n "${NAMESPACE}" --set imageTag=${IMAGE_PMM_SERVER#*:} --set service.type="LoadBalancer" \
-		--set imageRepo=${IMAGE_PMM_SERVER%:*} --set platform="${platform}" "https://percona-charts.storage.googleapis.com/pmm-server-${PMM_SERVER_VERSION}.tgz"
+	if [[ -n $OPENSHIFT ]]; then


no need for -n

e2e-tests/functions

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

e2e-tests/functions

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

e2e-tests/functions

egegunes · 2023-11-03T07:04:50Z

@nmarukovich should we set openshift: true in cr.yaml? https://github.com/percona/percona-postgresql-operator/blob/main/deploy/cr.yaml#L22

tplavcic · 2023-11-03T07:34:40Z

e2e-tests/functions

@@ -312,6 +345,9 @@ deploy_chaos_mesh() {

 	helm repo add chaos-mesh https://charts.chaos-mesh.org
 	helm install chaos-mesh chaos-mesh/chaos-mesh --namespace=${NAMESPACE} --set chaosDaemon.runtime=containerd --set chaosDaemon.socketPath=/run/containerd/containerd.sock --set dashboard.create=false --version 2.5.1
+	if [ ! -z "$OPENSHIFT" ]; then


We can use if [[ $OPENSHIFT ]]; like above or also if [ -n "$OPENSHIFT" ] instead of negation.

…a/percona-postgresql-operator into K8SPG-391_openshift_certification

nmarukovich · 2023-11-03T07:59:22Z

@nmarukovich should we set openshift: true in cr.yaml? https://github.com/percona/percona-postgresql-operator/blob/main/deploy/cr.yaml#L22

I can't see any difference do we use this option or not. As I understood from the code we check it automatically
https://github.com/percona/percona-postgresql-operator/blob/main/cmd/postgres-operator/main.go#L218
Am I wrong?

JNKPercona · 2023-11-03T08:41:34Z

Test name	Status
demand-backup	passed
init-deploy	passed
monitoring	passed
operator-self-healing	passed
scaling	passed
scheduled-backup	passed
self-healing	passed
start-from-backup	passed
telemetry-transfer	passed
users	passed
We run 10 out of 10

commit: f9b0017
image: perconalab/percona-postgresql-operator:PR-556-f9b0017fa

nmarukovich added 5 commits October 30, 2023 11:38

update role

da2bfd1

update role

8a6238f

Merge branch 'K8SPG-391_openshift_certification' of github.com:percon…

97ec1f8

…a/percona-postgresql-operator into K8SPG-391_openshift_certification

delete unused

6c46698

update tests

66fea84

github-actions bot reviewed Oct 30, 2023

View reviewed changes

e2e-tests/functions Outdated Show resolved Hide resolved

e2e-tests/functions Outdated Show resolved Hide resolved

e2e-tests/functions Outdated Show resolved Hide resolved

e2e-tests/functions Outdated Show resolved Hide resolved

nmarukovich and others added 3 commits October 30, 2023 11:58

Apply suggestions from code review

c5af8d4

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

update rbac

92a6cd5

Merge branch 'K8SPG-391_openshift_certification' of github.com:percon…

4a08c3a

…a/percona-postgresql-operator into K8SPG-391_openshift_certification

nmarukovich marked this pull request as ready for review October 30, 2023 12:28

nmarukovich requested review from tplavcic, ptankov, hors, egegunes, inelpandzic and pooknull as code owners October 30, 2023 12:28

fix image

7cdb52d

pooknull previously approved these changes Oct 31, 2023

View reviewed changes

hors previously approved these changes Oct 31, 2023

View reviewed changes

hors mentioned this pull request Oct 31, 2023

K8SPG-407 allow perconapgclusters/finalizers in role #492

Closed

11 tasks

ptankov reviewed Oct 31, 2023

View reviewed changes

fix PR comments

66d5c6c

nmarukovich dismissed stale reviews from hors and pooknull via 66d5c6c November 1, 2023 06:33

github-actions bot reviewed Nov 1, 2023

View reviewed changes

e2e-tests/functions Outdated Show resolved Hide resolved

e2e-tests/functions Outdated Show resolved Hide resolved

e2e-tests/functions Outdated Show resolved Hide resolved

e2e-tests/functions Outdated Show resolved Hide resolved

ptankov reviewed Nov 1, 2023

View reviewed changes

nmarukovich added 2 commits November 1, 2023 12:50

fix PR comments

8dc2e67

fix PR comments

57741bb

github-actions bot reviewed Nov 1, 2023

View reviewed changes

e2e-tests/functions Outdated Show resolved Hide resolved

nmarukovich and others added 4 commits November 1, 2023 12:54

Update e2e-tests/functions

95ac3ed

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

fix PR comments

e13a2a7

fix PR comments

999bc4a

update comments

23e2783

github-actions bot reviewed Nov 2, 2023

View reviewed changes

e2e-tests/functions Outdated Show resolved Hide resolved

e2e-tests/functions Outdated Show resolved Hide resolved

hors and others added 3 commits November 2, 2023 16:39

Update e2e-tests/functions

de8435b

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Update e2e-tests/functions

4e0fbfb

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Merge branch 'main' into K8SPG-391_openshift_certification

3edcfba

github-actions bot reviewed Nov 2, 2023

View reviewed changes

e2e-tests/functions Outdated Show resolved Hide resolved

hors self-requested a review November 2, 2023 18:20

hors previously approved these changes Nov 2, 2023

View reviewed changes

tplavcic requested changes Nov 3, 2023

View reviewed changes

nmarukovich added 2 commits November 3, 2023 11:52

fix PR comments

0a222f0

Merge branch 'K8SPG-391_openshift_certification' of github.com:percon…

f9b0017

…a/percona-postgresql-operator into K8SPG-391_openshift_certification

nmarukovich dismissed hors’s stale review via f9b0017 November 3, 2023 07:53

ptankov self-requested a review November 3, 2023 08:12

ptankov approved these changes Nov 3, 2023

View reviewed changes

nmarukovich requested a review from tplavcic November 3, 2023 09:03

tplavcic approved these changes Nov 3, 2023

View reviewed changes

hors merged commit dfad89f into main Nov 3, 2023
11 checks passed

hors deleted the K8SPG-391_openshift_certification branch November 3, 2023 11:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

K8SPG-391 openshift certification #556

K8SPG-391 openshift certification #556

nmarukovich commented Oct 30, 2023 •

edited by pull-request-badge bot

Loading

ptankov Oct 31, 2023 •

edited

Loading

nmarukovich Oct 31, 2023

ptankov Oct 31, 2023 •

edited

Loading

ptankov Oct 31, 2023 •

edited

Loading

ptankov Oct 31, 2023

ptankov Oct 31, 2023

nmarukovich Nov 1, 2023

ptankov Nov 1, 2023

ptankov Oct 31, 2023

ptankov Nov 1, 2023

ptankov Nov 1, 2023

ptankov Nov 1, 2023

egegunes commented Nov 3, 2023

tplavcic Nov 3, 2023

nmarukovich commented Nov 3, 2023

JNKPercona commented Nov 3, 2023

K8SPG-391 openshift certification #556

K8SPG-391 openshift certification #556

Conversation

nmarukovich commented Oct 30, 2023 • edited by pull-request-badge bot Loading

CHANGE DESCRIPTION

CHECKLIST

ptankov Oct 31, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ptankov Oct 31, 2023 • edited Loading

Choose a reason for hiding this comment

ptankov Oct 31, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

egegunes commented Nov 3, 2023

Choose a reason for hiding this comment

nmarukovich commented Nov 3, 2023

JNKPercona commented Nov 3, 2023

nmarukovich commented Oct 30, 2023 •

edited by pull-request-badge bot

Loading

ptankov Oct 31, 2023 •

edited

Loading

ptankov Oct 31, 2023 •

edited

Loading

ptankov Oct 31, 2023 •

edited

Loading