Order the env vars converted from annotations (#164)

This fixes a bug when spec.annotations has multiple annotations. Each
annotation is converted to an environment variable in the server container.
Prior to this fix, if you had multiple annotations defined the StatefulSet we
generate each reconcile cycle could change. This causes the statefulset
controller to go into a rolling upgrade -- update pod, wait for it to be ready,
update next pod, etc.

The StatefulSet wasn't really changing though. It was just the order that we
declared the environment variables. The fix is to sort the environment
variables so that the order is consistent. That way the StatefulSet we generate
doesn't change if the annotations didn't change.

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The file is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## 1.3.1 - 2022-03-02
+### Fixed
+* [#164](https://github.com/vertica/vertica-kubernetes/issues/164) Order the environment variables that were converted from annotations.  Prior to this fix, it was quite easy to get the statefulset controller to go into a repeated rolling upgrade.  The order ensures the statefulset doesn't appear to change between reconcile cycles.
+* [#161](https://github.com/vertica/vertica-kubernetes/issues/161) Tolerate slashes being at the end of the communal endpoint url
+
 ## 1.3.0 - 2022-02-18
 ### Added
 * [#146](https://github.com/vertica/vertica-kubernetes/issues/146) All annotations in the CR will be converted to environment variables in the containers.

Makefile

@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 1.3.0
+VERSION ?= 1.3.1
 
 # VLOGGER_VERSION defines the version to use for the Vertica logger image
 # (see docker-vlogger).  This version is separate from VERSION above in

README.md

@@ -14,7 +14,7 @@ To deploy the operator and a Kubernetes cluster in a local test environment that
 Vertica extends the Kubernetes API with its [Custom Resource Definition](https://www.vertica.com/docs/latest/HTML/Content/Authoring/Containers/Kubernetes/ContainerizedVerticaWithK8s.htm). Install the `CustomResourceDefinition` with a YAML manifest:
 
 ```shell
-kubectl apply -f https://github.com/vertica/vertica-kubernetes/releases/download/v1.3.0/verticadbs.vertica.com-crd.yaml
+kubectl apply -f https://github.com/vertica/vertica-kubernetes/releases/download/v1.3.1/verticadbs.vertica.com-crd.yaml
 ```
 
 # Installing the VerticaDB Operator

changes/1.3.1.md

@@ -0,0 +1,4 @@
+## 1.3.1 - 2022-03-02
+### Fixed
+* [#164](https://github.com/vertica/vertica-kubernetes/issues/164) Order the environment variables that were converted from annotations.  Prior to this fix, it was quite easy to get the statefulset controller to go into a repeated rolling upgrade.  The order ensures the statefulset doesn't appear to change between reconcile cycles.
+* [#161](https://github.com/vertica/vertica-kubernetes/issues/161) Tolerate slashes being at the end of the communal endpoint url

config/manifests/bases/verticadb-operator.clusterserviceversion.yaml

@@ -502,7 +502,7 @@ spec:
     * Service management and health monitoring for pods
     * Load balancing for internal and external traffic
 
-    For a brief overview on how to create a cluster, see the [Vertica GitHub repository](https://github.com/vertica/vertica-kubernetes). For an in-depth look at Vertica on Kubernetes, see the [Vertica documentation](https://www.vertica.com/docs/11.0.x/HTML/Content/Authoring/Containers/ContainerizedVertica.htm).
+    For a brief overview on how to create a cluster, see the [Vertica GitHub repository](https://github.com/vertica/vertica-kubernetes). For an in-depth look at Vertica on Kubernetes, see the [Vertica documentation](https://www.vertica.com/docs/latest/HTML/Content/Authoring/Containers/ContainerizedVertica.htm).
   displayName: VerticaDB Operator
   icon:
   - base64data: iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAACXBIWXMAAAsTAAALEwEAmpwYAAAcAmlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNi4wLWMwMDIgNzkuMTY0NDYwLCAyMDIwLzA1LzEyLTE2OjA0OjE3ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcFRQZz0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3QvcGcvIiB4bWxuczpzdERpbT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL0RpbWVuc2lvbnMjIiB4bWxuczp4bXBHPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvZy8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczppbGx1c3RyYXRvcj0iaHR0cDovL25zLmFkb2JlLmNvbS9pbGx1c3RyYXRvci8xLjAvIiB4bWxuczpwZGY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vcGRmLzEuMy8iIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBJbGx1c3RyYXRvciAyNC4zIChNYWNpbnRvc2gpIiB4bXA6Q3JlYXRlRGF0ZT0iMjAyMC0wOS0xMFQwOTo1Njo1My0wNTowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAyMC0wOS0xMFQwOTo1OTo1NC0wNTowMCIgeG1wOk1vZGlmeURhdGU9IjIwMjAtMDktMTBUMDk6NTk6NTQtMDU6MDAiIHhtcFRQZzpOUGFnZXM9IjEiIHhtcFRQZzpIYXNWaXNpYmxlVHJhbnNwYXJlbmN5PSJGYWxzZSIgeG1wVFBnOkhhc1Zpc2libGVPdmVycHJpbnQ9IkZhbHNlIiBkYzpmb3JtYXQ9ImltYWdlL3BuZyIgeG1wTU06RG9jdW1lbnRJRD0iYWRvYmU6ZG9jaWQ6cGhvdG9zaG9wOjViNjFkYjc4LTcxMGEtZjE0MS05ZjZjLWU2ZjI0YmY4YjY4NCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDozNTRkMjUyNi1lZTQyLTQyZmUtYjgzMC04ZGYxNWQzN2M5ZDciIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoyMzBmNjUyZC0yYzJjLTRmMzktYjE4ZS1mM2ViODgwNzlhZDAiIHhtcE1NOlJlbmRpdGlvbkNsYXNzPSJwcm9vZjpwZGYiIGlsbHVzdHJhdG9yOlR5cGU9IkRvY3VtZW50IiBpbGx1c3RyYXRvcjpDcmVhdG9yU3ViVG9vbD0iQUlSb2JpbiIgcGRmOlByb2R1Y2VyPSJBZG9iZSBQREYgbGlicmFyeSAxNS4wMCIgcGhvdG9zaG9wOkNvbG9yTW9kZT0iMyIgcGhvdG9zaG9wOklDQ1Byb2ZpbGU9InNSR0IgSUVDNjE5NjYtMi4xIj4gPHhtcFRQZzpNYXhQYWdlU2l6ZSBzdERpbTp3PSI1MTIuMDAwMDAwIiBzdERpbTpoPSI1MTIuMDAwMDAwIiBzdERpbTp1bml0PSJQb2ludHMiLz4gPHhtcFRQZzpQbGF0ZU5hbWVzPiA8cmRmOlNlcT4gPHJkZjpsaT5DeWFuPC9yZGY6bGk+IDxyZGY6bGk+TWFnZW50YTwvcmRmOmxpPiA8cmRmOmxpPlllbGxvdzwvcmRmOmxpPiA8cmRmOmxpPkJsYWNrPC9yZGY6bGk+IDwvcmRmOlNlcT4gPC94bXBUUGc6UGxhdGVOYW1lcz4gPHhtcFRQZzpTd2F0Y2hHcm91cHM+IDxyZGY6U2VxPiA8cmRmOmxpPiA8cmRmOkRlc2NyaXB0aW9uIHhtcEc6Z3JvdXBOYW1lPSJEZWZhdWx0IFN3YXRjaCBHcm91cCIgeG1wRzpncm91cFR5cGU9IjAiPiA8eG1wRzpDb2xvcmFudHM+IDxyZGY6U2VxPiA8cmRmOmxpIHhtcEc6c3dhdGNoTmFtZT0iQnJhbmQgQmx1ZSIgeG1wRzptb2RlPSJSR0IiIHhtcEc6dHlwZT0iUFJPQ0VTUyIgeG1wRzpyZWQ9IjAiIHhtcEc6Z3JlZW49IjEyMSIgeG1wRzpibHVlPSIyMzkiLz4gPHJkZjpsaSB4bXBHOnN3YXRjaE5hbWU9IlB1cnBsZSIgeG1wRzptb2RlPSJSR0IiIHhtcEc6dHlwZT0iUFJPQ0VTUyIgeG1wRzpyZWQ9IjE5OCIgeG1wRzpncmVlbj0iMjMiIHhtcEc6Ymx1ZT0iMTU3Ii8+IDxyZGY6bGkgeG1wRzpzd2F0Y2hOYW1lPSJJbmRpZ28iIHhtcEc6bW9kZT0iUkdCIiB4bXBHOnR5cGU9IlBST0NFU1MiIHhtcEc6cmVkPSIxMTYiIHhtcEc6Z3JlZW49IjM3IiB4bXBHOmJsdWU9IjE3MyIvPiA8cmRmOmxpIHhtcEc6c3dhdGNoTmFtZT0iRGFyayBCbHVlIiB4bXBHOm1vZGU9IlJHQiIgeG1wRzp0eXBlPSJQUk9DRVNTIiB4bXBHOnJlZD0iMzUiIHhtcEc6Z3JlZW49IjI4IiB4bXBHOmJsdWU9IjE2NSIvPiA8cmRmOmxpIHhtcEc6c3dhdGNoTmFtZT0iQ2VydWxlYW4iIHhtcEc6bW9kZT0iUkdCIiB4bXBHOnR5cGU9IlBST0NFU1MiIHhtcEc6cmVkPSIzMiIgeG1wRzpncmVlbj0iMTA0IiB4bXBHOmJsdWU9IjE5MyIvPiA8cmRmOmxpIHhtcEc6c3dhdGNoTmFtZT0iQXF1YSIgeG1wRzptb2RlPSJSR0IiIHhtcEc6dHlwZT0iUFJPQ0VTUyIgeG1wRzpyZWQ9IjQxIiB4bXBHOmdyZWVuPSIyMDYiIHhtcEc6Ymx1ZT0iMjU0Ii8+IDxyZGY6bGkgeG1wRzpzd2F0Y2hOYW1lPSJBcXVhbWFyaW5lIiB4bXBHOm1vZGU9IlJHQiIgeG1wRzp0eXBlPSJQUk9DRVNTIiB4bXBHOnJlZD0iNDciIHhtcEc6Z3JlZW49IjIxNCIgeG1wRzpibHVlPSIxOTUiLz4gPHJkZjpsaSB4bXBHOnN3YXRjaE5hbWU9IkNyaW1zb24iIHhtcEc6bW9kZT0iUkdCIiB4bXBHOnR5cGU9IlBST0NFU1MiIHhtcEc6cmVkPSIyMjkiIHhtcEc6Z3JlZW49IjAiIHhtcEc6Ymx1ZT0iMjYiLz4gPHJkZjpsaSB4bXBHOnN3YXRjaE5hbWU9IkFwcmljb3QiIHhtcEc6bW9kZT0iUkdCIiB4bXBHOnR5cGU9IlBST0NFU1MiIHhtcEc6cmVkPSIyNDQiIHhtcEc6Z3JlZW49IjEzOSIgeG1wRzpibHVlPSI1MiIvPiA8cmRmOmxpIHhtcEc6c3dhdGNoTmFtZT0iWWVsbG93IiB4bXBHOm1vZGU9IlJHQiIgeG1wRzp0eXBlPSJQUk9DRVNTIiB4bXBHOnJlZD0iMjUyIiB4bXBHOmdyZWVuPSIyMTkiIHhtcEc6Ymx1ZT0iMzEiLz4gPHJkZjpsaSB4bXBHOnN3YXRjaE5hbWU9IkdyZWVuIiB4bXBHOm1vZGU9IlJHQiIgeG1wRzp0eXBlPSJQUk9DRVNTIiB4bXBHOnJlZD0iMjYiIHhtcEc6Z3JlZW49IjE3MiIgeG1wRzpibHVlPSI5NiIvPiA8cmRmOmxpIHhtcEc6c3dhdGNoTmFtZT0iQz0wIE09MCBZPTAgSz0xMDAiIHhtcEc6bW9kZT0iUkdCIiB4bXBHOnR5cGU9IlBST0NFU1MiIHhtcEc6cmVkPSIzNSIgeG1wRzpncmVlbj0iMzEiIHhtcEc6Ymx1ZT0iMzIiLz4gPHJkZjpsaSB4bXBHOnN3YXRjaE5hbWU9IkM9MCBNPTAgWT0wIEs9OTAiIHhtcEc6bW9kZT0iUkdCIiB4bXBHOnR5cGU9IlBST0NFU1MiIHhtcEc6cmVkPSI2NSIgeG1wRzpncmVlbj0iNjQiIHhtcEc6Ymx1ZT0iNjYiLz4gPHJkZjpsaSB4bXBHOnN3YXRjaE5hbWU9IkM9MCBNPTAgWT0wIEs9ODAiIHhtcEc6bW9kZT0iUkdCIiB4bXBHOnR5cGU9IlBST0NFU1MiIHhtcEc6cmVkPSI4OCIgeG1wRzpncmVlbj0iODkiIHhtcEc6Ymx1ZT0iOTEiLz4gPHJkZjpsaSB4bXBHOnN3YXRjaE5hbWU9IkM9MCBNPTAgWT0wIEs9NzAiIHhtcEc6bW9kZT0iUkdCIiB4bXBHOnR5cGU9IlBST0NFU1MiIHhtcEc6cmVkPSIxMDkiIHhtcEc6Z3JlZW49IjExMCIgeG1wRzpibHVlPSIxMTMiLz4gPHJkZjpsaSB4bXBHOnN3YXRjaE5hbWU9IkM9MCBNPTAgWT0wIEs9NjAiIHhtcEc6bW9kZT0iUkdCIiB4bXBHOnR5cGU9IlBST0NFU1MiIHhtcEc6cmVkPSIxMjgiIHhtcEc6Z3JlZW49IjEzMCIgeG1wRzpibHVlPSIxMzMiLz4gPHJkZjpsaSB4bXBHOnN3YXRjaE5hbWU9IkM9MCBNPTAgWT0wIEs9NTAiIHhtcEc6bW9kZT0iUkdCIiB4bXBHOnR5cGU9IlBST0NFU1MiIHhtcEc6cmVkPSIxNDciIHhtcEc6Z3JlZW49IjE0OSIgeG1wRzpibHVlPSIxNTIiLz4gPHJkZjpsaSB4bXBHOnN3YXRjaE5hbWU9IkM9MCBNPTAgWT0wIEs9NDAiIHhtcEc6bW9kZT0iUkdCIiB4bXBHOnR5cGU9IlBST0NFU1MiIHhtcEc6cmVkPSIxNjciIHhtcEc6Z3JlZW49IjE2OSIgeG1wRzpibHVlPSIxNzIiLz4gPHJkZjpsaSB4bXBHOnN3YXRjaE5hbWU9IkM9MCBNPTAgWT0wIEs9MzAiIHhtcEc6bW9kZT0iUkdCIiB4bXBHOnR5cGU9IlBST0NFU1MiIHhtcEc6cmVkPSIxODgiIHhtcEc6Z3JlZW49IjE5MCIgeG1wRzpibHVlPSIxOTIiLz4gPHJkZjpsaSB4bXBHOnN3YXRjaE5hbWU9IkM9MCBNPTAgWT0wIEs9MjAiIHhtcEc6bW9kZT0iUkdCIiB4bXBHOnR5cGU9IlBST0NFU1MiIHhtcEc6cmVkPSIyMDkiIHhtcEc6Z3JlZW49IjIxMSIgeG1wRzpibHVlPSIyMTIiLz4gPHJkZjpsaSB4bXBHOnN3YXRjaE5hbWU9IkM9MCBNPTAgWT0wIEs9MTAiIHhtcEc6bW9kZT0iUkdCIiB4bXBHOnR5cGU9IlBST0NFU1MiIHhtcEc6cmVkPSIyMzAiIHhtcEc6Z3JlZW49IjIzMSIgeG1wRzpibHVlPSIyMzIiLz4gPHJkZjpsaSB4bXBHOnN3YXRjaE5hbWU9IkM9MCBNPTAgWT0wIEs9NSIgeG1wRzptb2RlPSJSR0IiIHhtcEc6dHlwZT0iUFJPQ0VTUyIgeG1wRzpyZWQ9IjI0MSIgeG1wRzpncmVlbj0iMjQyIiB4bXBHOmJsdWU9IjI0MiIvPiA8L3JkZjpTZXE+IDwveG1wRzpDb2xvcmFudHM+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpsaT4gPC9yZGY6U2VxPiA8L3htcFRQZzpTd2F0Y2hHcm91cHM+IDxkYzp0aXRsZT4gPHJkZjpBbHQ+IDxyZGY6bGkgeG1sOmxhbmc9IngtZGVmYXVsdCI+VmVydGljYSBMb2dvIFNtYWxsPC9yZGY6bGk+IDwvcmRmOkFsdD4gPC9kYzp0aXRsZT4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY29udmVydGVkIiBzdEV2dDpwYXJhbWV0ZXJzPSJmcm9tIGFwcGxpY2F0aW9uL3Bvc3RzY3JpcHQgdG8gYXBwbGljYXRpb24vdm5kLmFkb2JlLmlsbHVzdHJhdG9yIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDoyMzBmNjUyZC0yYzJjLTRmMzktYjE4ZS1mM2ViODgwNzlhZDAiIHN0RXZ0OndoZW49IjIwMTYtMTItMDFUMTU6MTc6NTQtMDU6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIElsbHVzdHJhdG9yIENDIDIwMTUgKE1hY2ludG9zaCkiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNvbnZlcnRlZCIgc3RFdnQ6cGFyYW1ldGVycz0iZnJvbSBhcHBsaWNhdGlvbi9wb3N0c2NyaXB0IHRvIGFwcGxpY2F0aW9uL3ZuZC5hZG9iZS5pbGx1c3RyYXRvciIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY29udmVydGVkIiBzdEV2dDpwYXJhbWV0ZXJzPSJmcm9tIGFwcGxpY2F0aW9uL3Bvc3RzY3JpcHQgdG8gYXBwbGljYXRpb24vdm5kLmFkb2JlLmlsbHVzdHJhdG9yIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDphNGMzNTc2ZC1hMTEwLTRmZDQtODFiOS1hODFkOThiYmY5MzMiIHN0RXZ0OndoZW49IjIwMTctMDYtMzBUMTc6NTk6MjYtMDU6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIElsbHVzdHJhdG9yIENDIDIwMTcgKE1hY2ludG9zaCkiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNvbnZlcnRlZCIgc3RFdnQ6cGFyYW1ldGVycz0iZnJvbSBhcHBsaWNhdGlvbi9wb3N0c2NyaXB0IHRvIGFwcGxpY2F0aW9uL3ZuZC5hZG9iZS5pbGx1c3RyYXRvciIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6NzgzYmEyNWMtOGZlNi00ZTg1LTk3ZmMtNDYyZWE3YTNiOTQ3IiBzdEV2dDp3aGVuPSIyMDE3LTA3LTA0VDA5OjI4OjAyLTA1OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBJbGx1c3RyYXRvciBDQyAyMDE3IChNYWNpbnRvc2gpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDplMWVjYmY3Yy05YWNlLTQ3NzQtOTFmNC0yM2EwYzAxOTNiY2IiIHN0RXZ0OndoZW49IjIwMjAtMDktMTBUMDk6Mzg6MjItMDU6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIElsbHVzdHJhdG9yIDI0LjMgKE1hY2ludG9zaCkiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNvbnZlcnRlZCIgc3RFdnQ6cGFyYW1ldGVycz0iZnJvbSBhcHBsaWNhdGlvbi9wZGYgdG8gYXBwbGljYXRpb24vdm5kLmFkb2JlLnBob3Rvc2hvcCIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iZGVyaXZlZCIgc3RFdnQ6cGFyYW1ldGVycz0iY29udmVydGVkIGZyb20gYXBwbGljYXRpb24vdm5kLmFkb2JlLnBob3Rvc2hvcCB0byBpbWFnZS9wbmciLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjI0ZmM1MzkzLWFmYTctNDE4NC1iNzQ5LTY5MzVjMDE0YmE2NCIgc3RFdnQ6d2hlbj0iMjAyMC0wOS0xMFQwOTo1OTozNS0wNTowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDIxLjIgKE1hY2ludG9zaCkiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjM1NGQyNTI2LWVlNDItNDJmZS1iODMwLThkZjE1ZDM3YzlkNyIgc3RFdnQ6d2hlbj0iMjAyMC0wOS0xMFQwOTo1OTo1NC0wNTowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDIxLjIgKE1hY2ludG9zaCkiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPC9yZGY6U2VxPiA8L3htcE1NOkhpc3Rvcnk+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ1dWlkOjc3MjAwOWI2LWM2MTQtNDY0My04MTQ5LTlmNmI3NDA4MWQxMSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDplMWVjYmY3Yy05YWNlLTQ3NzQtOTFmNC0yM2EwYzAxOTNiY2IiIHN0UmVmOm9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoyMzBmNjUyZC0yYzJjLTRmMzktYjE4ZS1mM2ViODgwNzlhZDAiIHN0UmVmOnJlbmRpdGlvbkNsYXNzPSJwcm9vZjpwZGYiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4g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
@@ -525,7 +525,7 @@ spec:
   - vertica
   links:
   - name: Documentation
-    url: https://www.vertica.com/docs/11.0.x/HTML/Content/Authoring/Containers/ContainerizedVertica.htm
+    url: https://www.vertica.com/docs/latest/HTML/Content/Authoring/Containers/ContainerizedVertica.htm
   - name: Vertica Container Images
     url: https://hub.docker.com/u/vertica
   maintainers:

helm-charts/verticadb-operator/Chart.yaml

@@ -15,4 +15,4 @@ name: verticadb-operator
 description: An operator that can deploy and manage Vertica clusters
 type: application
 # Versions follow Semantic Versioning (https://semver.org/)
-version: 1.3.0
+version: 1.3.1

helm-charts/verticadb-operator/values.yaml

@@ -18,7 +18,7 @@
 
 
 image:
-  name: vertica/verticadb-operator:1.3.0
+  name: vertica/verticadb-operator:1.3.1
 
 webhook:
   # The webhook requires a TLS certficate to work.  By default we rely on

pkg/controllers/builder.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"path/filepath"
 	"regexp"
+	"sort"
 	"strings"
 
 	vapi "github.com/vertica/vertica-kubernetes/api/v1beta1"
@@ -401,6 +402,13 @@ func translateAnnotationsToEnvVars(vdb *vapi.VerticaDB) []corev1.EnvVar {
 			Value: v,
 		})
 	}
+	// We must always sort the list of envVars.  Failure to do this could cause
+	// the statefulset controller to think the container that has the envVars
+	// has changed.  But in reality, the containers are identical except for the
+	// order of the vars.
+	sort.Slice(envVars, func(i, j int) bool {
+		return envVars[i].Name < envVars[j].Name
+	})
 	return envVars
 }
 

pkg/controllers/builder_test.go

@@ -0,0 +1,43 @@
+/*
+ (c) Copyright [2021-2022] Micro Focus or one of its affiliates.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ You may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+package controllers
+
+import (
+	"reflect"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	vapi "github.com/vertica/vertica-kubernetes/api/v1beta1"
+)
+
+var _ = Describe("builder", func() {
+	It("should generate identical k8s containers each time", func() {
+		vdb := vapi.MakeVDB()
+		vdb.Spec.Annotations = map[string]string{
+			"key1":                     "val1",
+			"key2":                     "val2",
+			"vertica.com/gitRef":       "abcd123",
+			"1_not_valid_env_var_name": "blah",
+		}
+
+		baseContainer := makeServerContainer(vdb, &vdb.Spec.Subclusters[0])
+		const MaxLoopIteratons = 100
+		for i := 1; i < MaxLoopIteratons; i++ {
+			c := makeServerContainer(vdb, &vdb.Spec.Subclusters[0])
+			Expect(reflect.DeepEqual(c, baseContainer)).Should(BeTrue())
+		}
+	})
+})

pkg/controllers/labels_annotations.go

@@ -32,11 +32,12 @@ const (
 	OperatorVersionLabel      = "app.kubernetes.io/version"
 	OperatorName              = "verticadb-operator" // The name of the operator
 
-	CurOperatorVersion = "1.3.0" // The version number of the operator
+	CurOperatorVersion = "1.3.1" // The version number of the operator
 	OperatorVersion100 = "1.0.0"
 	OperatorVersion110 = "1.1.0"
 	OperatorVersion120 = "1.2.0"
-	OperatorVersion130 = CurOperatorVersion
+	OperatorVersion130 = "1.3.0"
+	OperatorVersion131 = CurOperatorVersion
 )
 
 // makeSubclusterLabels returns the labels added for the subcluster

tests/e2e/update-strategy/60-set-new-license-and-annotations-ks-1.yaml

@@ -19,3 +19,6 @@ spec:
   licenseSecret: ce-license
   annotations:
     vertica.com/git-ref: 1fab313k
+    TZ: CET
+    usage: e2e
+    testcase-name: v-ks-1-update-strategy