docs(common): link "Release Process"-wiki page to the contribution rules

(#867)

* docs(common): optimize comment/uncomment doing (#867)

CONTRIBUTING.md

@@ -27,16 +27,18 @@ If you have any questions feel free to also send them to this email address.
 ## Contribution process
 
 1. Fork the repository
-2. Use the `main` branch for your edits
+2. Use the appropriate `develop\?` branch as base for your feature branch. See [Release Process](https://github.com/intershop/helm-charts/wiki/Release-Process)
 3. Work on changes
 4. Comment the changes
 5. Check whether the changes comply with the the rules (design etc.)
-6. Create a pull request
+6. Commit changes according to our Commit Message Guidelines
+6. Create a pull request into the `develop\?` base branch
 7. Add as much information as needed
 8. Reference the solved issue
 9. Wait for the review
 10. PR is approved, denied (with explanation) or sent back for further information
 11. We are trying to react as fast as possible to pull-request, issues, feedback and any other community interaction. However, we can’t guarantee a particular timeframe for every answer. We hope you understand and apologize for any inconveniences.
+12. If PR is approved the changes shall be merged via squash commit to improve commit history readability
 
 ## Commit Message Guidelines
 
@@ -48,6 +50,10 @@ Some rules to be emphasized for chart related commits:
 * A commit message starting with `feat(icm):` (or e.g.: `feat(pwa):`) will get a _MINOR_ change.
 * The rest will be _PATCH_.
 
-Chart unreleated commits (like e.g. docs, chore, build, test) will not be taken into account but still should be conventional and informative as possible.
+Please also enhance your commit message with an existing **github issue number**, where detailed information could be found. Github will later on link the commit to the issue ticket automatically.
 
-All of this will help to read and interpret our changlogs and release notes.
+Here is a sample commit message: `feat(icm): my short commit description (#123)`
+
+Chart unrelated commits (like e.g. docs, chore, build, test) will not be taken into account but still should be conventional and informative as possible.
+
+All of this will help to read and interpret our changlogs and release notes.

charts/icm-as/values.yaml

@@ -337,13 +337,13 @@ persistence:
 # Probes, all values are optional, below are the defaults
 probes:
   startup: {}
-  #    failureThreshold: 6
-  #    initialDelaySeconds: 60
-  #    periodSeconds: 10
+#    failureThreshold: 6
+#    initialDelaySeconds: 60
+#    periodSeconds: 10
   liveness: {}
-  #    failureThreshold: 3
-  #    initialDelaySeconds: 0
-  #    periodSeconds: 10
+#    failureThreshold: 3
+#    initialDelaySeconds: 0
+#    periodSeconds: 10
   readiness: {}
 #    failureThreshold: 3
 #    initialDelaySeconds: 0
@@ -527,27 +527,27 @@ replication:
   # The following "source" and "targets" configuration blocks take precedence over
   # the deprecated "targetSystemUrl" / "sourceDatabaseName" configurations
   # Configuration for source system that participates in replication
-  # source:
-    # the external URL of the webServer/proxy/ingress e.g. https://icm-web-edit-wa:443
-    # webserverUrl: <sourceExternalUrl>
-    # either mutual exclusive databaseUser or databaseLink have to be configured
-    # databaseLink: <sourceDatabaseLink>
-    # databaseUser: <sourceDatabaseUser>
-    # databaseName: <sourceDatabaseName>
+#  source:
+#    # the external URL of the webServer/proxy/ingress e.g. https://icm-web-edit-wa:443
+#    webserverUrl: <sourceExternalUrl>
+#    # either mutual exclusive databaseUser or databaseLink have to be configured
+#    databaseLink: <sourceDatabaseLink>
+#    databaseUser: <sourceDatabaseUser>
+#    databaseName: <sourceDatabaseName>
 
   # Configuration for all target systems that participates in replication
-  # targets:
-    # create multiple target systems - please avoid characters like '.', '-' or '_' in the chosen name/key
-    # live1:
-      # the external URL of the webServer/proxy/ingress e.g. https://icm-web-live-wa:443
-      # webserverUrl: <targetExternalUrl>
-      # this database user will be granted access to the database schema of the source replication system
-      # databaseUser: <targetDatabaseUser>
-    # live2:
-      # the external URL of the webServer/proxy/ingress e.g. https://icm-web-live-wa:443
-      # webserverUrl: <targetExternalUrl>
-      # this database user will be granted access to the database schema of the source replication system
-      # databaseUser: <targetDatabaseUser>
+#  targets:
+#    # create multiple target systems - please avoid characters like '.', '-' or '_' in the chosen name/key
+#    live1:
+#      # the external URL of the webServer/proxy/ingress e.g. https://icm-web-live-wa:443
+#      webserverUrl: <targetExternalUrl>
+#      # this database user will be granted access to the database schema of the source replication system
+#      databaseUser: <targetDatabaseUser>
+#    live2:
+#      # the external URL of the webServer/proxy/ingress e.g. https://icm-web-live-wa:443
+#      webserverUrl: <targetExternalUrl>
+#      # this database user will be granted access to the database schema of the source replication system
+#      databaseUser: <targetDatabaseUser>
 
 # Configuration of messaging via jgroups
 jgroups:

charts/icm/README.md

@@ -67,7 +67,7 @@ Prerequisites are:
 * [helm-unittest](https://github.com/helm-unittest/helm-unittest)
 
 ```bash
-helm unittest --helm3  --output-file unit.xml --output-type JUnit charts/icm
+helm unittest --output-file unit.xml --output-type JUnit charts/icm
 ```
 
 ### ct lint & install

charts/icm/values.yaml

@@ -7,8 +7,8 @@ icm-as:
     "cluster-autoscaler.kubernetes.io/safe-to-evict": "false"
 
   image:
-  #  repository: intershophub/icm-as
-  #  tag: :11.0.12-dev1
+#    repository: intershophub/icm-as
+#    tag: :11.0.12-dev1
 
   ## define a secret for a container registry
   dockerSecret:
@@ -75,27 +75,27 @@ icm-as:
     # The following "source" and "targets" configuration blocks take precedence over
     # the deprecated "targetSystemUrl" / "sourceDatabaseName" configurations
     # Configuration for source system that participates in replication
-    # source:
-      # the external URL of the webServer/proxy/ingress e.g. https://icm-web-edit-wa:443
-      # webserverUrl: <sourceExternalUrl>
-      # either mutual exclusive databaseUser or databaseLink have to be configured
-      # databaseLink: <sourceDatabaseLink>
-      # databaseUser: <sourceDatabaseUser>
-      # databaseName: <sourceDatabaseName>
+#    source:
+#      # the external URL of the webServer/proxy/ingress e.g. https://icm-web-edit-wa:443
+#      webserverUrl: <sourceExternalUrl>
+#      # either mutual exclusive databaseUser or databaseLink have to be configured
+#      databaseLink: <sourceDatabaseLink>
+#      databaseUser: <sourceDatabaseUser>
+#      databaseName: <sourceDatabaseName>
 
     # Configuration for all target systems that participates in replication
-    # targets:
-      # create multiple target systems - please avoid characters like '.', '-' or '_' in the chosen name/key
-      # live1:
-        # the external URL of the webServer/proxy/ingress e.g. https://icm-web-live-wa:443
-        # webserverUrl: <targetExternalUrl>
-        # this database user will be granted access to the database schema of the source replication system
-        # databaseUser: <targetDatabaseUser>
-      # live2:
-        # the external URL of the webServer/proxy/ingress e.g. https://icm-web-live-wa:443
-        # webserverUrl: <targetExternalUrl>
-        # this database user will be granted access to the database schema of the source replication system
-        # databaseUser: <targetDatabaseUser>
+#    targets:
+#      # create multiple target systems - please avoid characters like '.', '-' or '_' in the chosen name/key
+#      live1:
+#        # the external URL of the webServer/proxy/ingress e.g. https://icm-web-live-wa:443
+#        webserverUrl: <targetExternalUrl>
+#        # this database user will be granted access to the database schema of the source replication system
+#        databaseUser: <targetDatabaseUser>
+#      live2:
+#        # the external URL of the webServer/proxy/ingress e.g. https://icm-web-live-wa:443
+#        webserverUrl: <targetExternalUrl>
+#        # this database user will be granted access to the database schema of the source replication system
+#        databaseUser: <targetDatabaseUser>
 
 icm-web:
   enabled: true