OPSEXP-1120 update versions for 5.2.0-M1 (#626)

* OPSEXP-1120 update versions for 5.2.0-M1

* update docker compose share image

* fix chart version

* set postgres to 13.3 as per support matrix and update nginx to SSL

* fix repo community version in compose

* update common chart to M16

* upgrade postgresql helm chart

* update share in community compose

* add separate 7.1 config

* use ingress template and remove leftover vars

* use always default for ooiService

* align nginx and adw for compose

* revert ingress as it requires extra changes

* fix image location

* fix pdf-renderer

.checkov-ignore-list

@@ -1 +1 @@
-CKV_K8S_21,CKV_K8S_20,CKV_K8S_43,CKV_K8S_35,CKV_K8S_31,CKV_K8S_22,CKV_K8S_11,CKV_K8S_10,CKV_K8S_29,CKV_K8S_30,CKV_K8S_23,CKV_K8S_28,CKV_K8S_37,CKV_K8S_38,CKV_K8S_40,CKV_K8S_15
+CKV_K8S_21,CKV_K8S_20,CKV_K8S_43,CKV_K8S_35,CKV_K8S_31,CKV_K8S_22,CKV_K8S_11,CKV_K8S_10,CKV_K8S_29,CKV_K8S_30,CKV_K8S_23,CKV_K8S_28,CKV_K8S_37,CKV_K8S_38,CKV_K8S_40,CKV_K8S_15

.pre-commit-config.yaml

@@ -9,6 +9,26 @@ repos:
       - id: travis-yml-lint
       - id: helm-deps
       - id: helm-lint
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.0.1
+    hooks:
+      - id: check-yaml
+        args: [--allow-multiple-documents]
+        exclude: helm/.*/templates
+      - id: check-json
+      - id: check-merge-conflict
+      - id: fix-byte-order-marker
+      - id: mixed-line-ending
+        args: ['--fix=lf']
+      - id: end-of-file-fixer
+  - repo: https://github.com/IamTheFij/docker-pre-commit
+    rev: v2.0.1
+    hooks:
+      - id: docker-compose-check
+  - repo: https://github.com/sirosen/check-jsonschema
+    rev: 0.5.1
+    hooks:
+      - id: check-travis
   - repo: https://github.com/Alfresco/acs-deployment
     rev: v5.1.0-M2
     hooks:

.pre-commit-hooks.yaml

@@ -2,4 +2,4 @@
   name: Checkov - Helm check
   entry: bash -c "helm template helm/alfresco-content-services --set \"alfresco-search.alfresco-insight-zeppelin.insightzeppelin.enabled\"=true > helm/alfresco-content-services.yaml && checkov -f helm/alfresco-content-services.yaml --framework=kubernetes --skip-check $(cat .checkov-ignore-list) --quiet"
   language: system
-  pass_filenames: false
+  pass_filenames: false

.travis.yml

@@ -15,6 +15,7 @@ stages:
   - name: lint
   - name: test
   - name: community
+  - name: 7.1.N
   - name: 7.0.N
   - name: 6.2.N
   - name: 6.1.N
@@ -408,6 +409,13 @@ jobs:
       stage: community
       <<: *docker_deploy
 
+    - name: 7.1.N-helm
+      stage: 7.1.N
+      <<: *helm_deploy
+    - name: 7.1.N-compose
+      stage: 7.1.N
+      <<: *docker_deploy
+
     - name: 7.0.N-helm
       stage: 7.0.N
       <<: *helm_deploy

CONTRIBUTING.md

@@ -20,4 +20,4 @@ Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.
 available at [http://contributor-covenant.org/version/1/4][version]
 
 [homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+[version]: http://contributor-covenant.org/version/1/4/

LICENSE

@@ -188,4 +188,4 @@
    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.
+   limitations under the License.

README.md

@@ -25,16 +25,17 @@ A new version numbering scheme is also being introduced, during the development
 
 The table below shows the exact version of ACS deployed with each chart version/tag.
 
-| Chart Version/Tag | Default | 7.0.N | 6.2.N | 6.1.N | Community |
-|--|--|--|--|--|--|
-| 5.0.0-M1 | 7.0.0-M2 | | 6.2.2 | 6.1.1 | 6.2.1-A8 |
-| 5.0.0-M2 | 7.0.0-M3 | | 6.2.2 | 6.1.1 | 7.0.0-A10 |
-| 5.0.0 | 7.0.0 | | 6.2.2 | 6.1.1 | 7.0.0 |
-| 5.0.1 | 7.0.0 | | 6.2.2 | 6.1.1 | 7.0.0 |
-| 5.1.0-M1 | 7.1.0-M1 | | 6.2.2 | 6.1.1 | 7.1.0-M1 |
-| 5.1.0-M2 | 7.1.0-M2 | 7.0.1 | 6.2.2 | 6.1.1 | 7.1.0-M2 |
-| 5.1.0 | 7.1.0.1 | 7.0.1 | 6.2.2 | 6.1.1 | 7.1.0 |
-| 5.1.1 | 7.1.0.1 | 7.0.1 | 6.2.2 | 6.1.1 | 7.1.0 |
+| Chart Version/Tag | Default  | 7.1.N   | 7.0.N | 6.2.N | 6.1.N | Community |
+|-------------------|----------|---------|-------|-------|-------|-----------|
+| 5.0.0-M1          | 7.0.0-M2 |         |       | 6.2.2 | 6.1.1 | 6.2.1-A8  |
+| 5.0.0-M2          | 7.0.0-M3 |         |       | 6.2.2 | 6.1.1 | 7.0.0-A10 |
+| 5.0.0             | 7.0.0    |         |       | 6.2.2 | 6.1.1 | 7.0.0     |
+| 5.0.1             | 7.0.0    |         |       | 6.2.2 | 6.1.1 | 7.0.0     |
+| 5.1.0-M1          | 7.1.0-M1 |         |       | 6.2.2 | 6.1.1 | 7.1.0-M1  |
+| 5.1.0-M2          | 7.1.0-M2 |         | 7.0.1 | 6.2.2 | 6.1.1 | 7.1.0-M2  |
+| 5.1.0             | 7.1.0.1  |         | 7.0.1 | 6.2.2 | 6.1.1 | 7.1.0     |
+| 5.1.1             | 7.1.0.1  |         | 7.0.1 | 6.2.2 | 6.1.1 | 7.1.0     |
+| 5.2.0-M1          | 7.2.0-M1 | 7.1.0.1 | 7.0.1 | 6.2.2 | 6.1.1 | 7.2.0-M1  |
 
 ### Docker
 
@@ -52,7 +53,7 @@ By default the latest version of the chart will always deploy the latest develop
 
 NOTE: As the Helm chart no longer deploys a specific version of ACS the `appVersion` property within the chart is longer be specified.
 
-Our tests are executed using Helm 3.2.4, kubectl 1.18.4 against an EKS cluster running Kubernetes 1.17.
+Our tests are executed using Helm 3.5.4, kubectl 1.18.9 against an EKS cluster running Kubernetes 1.21.
 
 ## Getting Started