Skip to content

Commit

Permalink
Merge pull request #55 from IBM/Release-Jan-2021
Browse files Browse the repository at this point in the history
Runbook release for January 2021
  • Loading branch information
cnrmrph authored Jan 28, 2021
2 parents 1dcad6a + b6f2ea7 commit 0f74cdc
Show file tree
Hide file tree
Showing 23 changed files with 161 additions and 15 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

All notable changes to this project will be documented in this file

## v21.1.0

### Added

* Adds pod Anti-affinity rules to distribute a replica across the availability zones, and nodes within them.
* Activate logout for SAML when using single sign-on (SSO)

## v20.12.0

Expand Down
2 changes: 1 addition & 1 deletion helm-charts/apps/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ description: |-
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
version: 3.2.2
version: 3.3.0
maintainers:
- name: IBM
- name: Cúram SPM Dev Team
Expand Down
5 changes: 5 additions & 0 deletions helm-charts/apps/RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@

# Version History

## v3.3.0

* Adds pod Anti-affinity rules to distribute a replica across the availability zones, and nodes within them.
* Activate logout for SAML when using single sign-on (SSO)

## v3.2.2

* Adds values from `podAnnotations` at deployment
Expand Down
5 changes: 3 additions & 2 deletions helm-charts/apps/templates/configmaps/configmap-isam.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{{- if $.Values.global.isam.enabled }}
---
###############################################################################
# Copyright 2019,2020 IBM Corporation
# Copyright 2019,2021 IBM Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -42,7 +42,8 @@ data:
spHostAndPort="{{ $.Values.global.ingress.hostname}}"
disableLtpaCookie="false"
allowCustomCacheKey="false"
enabled="true">
enabled="true"
spLogout="true">
</samlWebSso20>
<authFilter id="curamAuthFilter">
Expand Down
20 changes: 20 additions & 0 deletions helm-charts/apps/templates/deployment-consumer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,26 @@ spec:
{{- include "sch.security.securityContext" (list $ $.sch.chart.podSecurityContext) | indent 6 }}
affinity:
{{- include "sch.affinity.nodeAffinity" (list $ $.sch.chart.nodeAffinity) | indent 8 }}
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app.kubernetes.io/component
operator: In
values:
- {{ (printf "%s-consumer" $name) }}
topologyKey: topology.kubernetes.io/zone
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app.kubernetes.io/component
operator: In
values:
- {{ (printf "%s-consumer" $name) }}
topologyKey: kubernetes.io/hostname
{{- if or $.Values.global.imagePullSecret.secretName $.Values.global.imagePullSecret.username }}
imagePullSecrets:
- name: {{ default (printf "%s-pull-secret" $.Release.Name) $.Values.global.imagePullSecret.secretName }}
Expand Down
20 changes: 20 additions & 0 deletions helm-charts/apps/templates/deployment-producer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,26 @@ spec:
{{- include "sch.security.securityContext" (list $ $.sch.chart.podSecurityContext) | nindent 6 }}
affinity:
{{- include "sch.affinity.nodeAffinity" (list $ $.sch.chart.nodeAffinity) | nindent 8 }}
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app.kubernetes.io/component
operator: In
values:
- {{ (printf "%s-producer" $name) }}
topologyKey: topology.kubernetes.io/zone
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app.kubernetes.io/component
operator: In
values:
- {{ (printf "%s-producer" $name) }}
topologyKey: kubernetes.io/hostname
{{- if or $.Values.global.imagePullSecret.secretName $.Values.global.imagePullSecret.username }}
imagePullSecrets:
- name: {{ default (printf "%s-pull-secret" $.Release.Name) $.Values.global.imagePullSecret.secretName }}
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/mqserver/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ description: |-
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
version: 1.7.2
version: 1.8.0
maintainers:
- name: IBM
- name: Cúram SPM Dev Team
Expand Down
4 changes: 4 additions & 0 deletions helm-charts/mqserver/RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@

# Version History

## v1.8.0

* Adds pod Anti-affinity rules to distribute a replica across the availability zones, and nodes within them.

## v1.7.2

* Added `mountOptions` value configuration to PVs and `values` file.
Expand Down
1 change: 1 addition & 0 deletions helm-charts/mqserver/templates/_sch-chart-config.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ the Shared Configurable Helpers overridden for this chart.
*/ -}}
{{- define "mqserver.sch.chart.config.values" -}}
sch:
appName: mqserver
chart:
nodeAffinity:
nodeAffinityRequiredDuringScheduling:
Expand Down
20 changes: 20 additions & 0 deletions helm-charts/mqserver/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,26 @@ spec:
{{- include "sch.security.securityContext" (list $ $.sch.chart.podSecurityContext) | nindent 6 }}
affinity:
{{- include "sch.affinity.nodeAffinity" (list $ $.sch.chart.nodeAffinity) | nindent 8 }}
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app.kubernetes.io/component
operator: In
values:
- mqserver
topologyKey: topology.kubernetes.io/zone
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app.kubernetes.io/component
operator: In
values:
- mqserver
topologyKey: kubernetes.io/hostname
restartPolicy: {{ .restartPolicy | default "Always" }}
volumes:
- name: mqsc-cmds
Expand Down
12 changes: 6 additions & 6 deletions helm-charts/spm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ description: |-
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
version: 2.3.0
version: 2.4.0
maintainers:
- name: IBM
- name: Cúram SPM Dev Team
Expand All @@ -56,22 +56,22 @@ icon: https://avatars2.githubusercontent.com/u/1459110

dependencies:
- name: apps
version: "~3.2.2"
version: "~3.3.0"
repository: "@local-development"
- name: batch
version: "~2.1.0"
repository: "@local-development"
- name: uawebapp
version: "~3.1.0"
version: "~3.2.0"
repository: "@local-development"
- name: web
version: "~3.1.0"
version: "~3.2.0"
repository: "@local-development"
- name: mqserver
version: "~1.7.2"
version: "~1.8.0"
repository: "@local-development"
- name: xmlserver
version: "~2.0.3"
version: "~2.1.0"
repository: "@local-development"
- name: ibm-sch
repository: "@sch"
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/uawebapp/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ description: |-
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
version: 3.1.0
version: 3.2.0
maintainers:
- name: IBM
- name: Cúram SPM Dev Team
Expand Down
4 changes: 4 additions & 0 deletions helm-charts/uawebapp/RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
# Version History
## v3.2.0
* Adds pod Anti-affinity rules to distribute a replica across the availability zones, and nodes within them.
## v3.1.0
* Add rewrite rule and condition to configmaps to fix verb tampering vulnerability.
Expand Down
14 changes: 14 additions & 0 deletions helm-charts/uawebapp/templates/_sch-chart-config.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,21 @@ the Shared Configurable Helpers overridden for this chart.
*/ -}}
{{- define "uawebapp.sch.chart.config.values" -}}
sch:
appName: uawebapp
chart:
podAntiAffinity:
preferredDuringScheduling:
uawebapp:
weight: 100
key: app.kubernetes.io/name
operator: In
topologyKey: topology.kubernetes.io/zone
preferredDuringScheduling:
uawebapp:
weight: 100
key: app.kubernetes.io/name
operator: In
topologyKey: kubernetes.io/hostname
nodeAffinity:
nodeAffinityRequiredDuringScheduling:
key: beta.kubernetes.io/arch
Expand Down
1 change: 1 addition & 0 deletions helm-charts/uawebapp/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ spec:
{{- include "sch.security.securityContext" (list . .sch.chart.podSecurityContext) | nindent 6 }}
affinity:
{{- include "sch.affinity.nodeAffinity" (list . .sch.chart.nodeAffinity) | nindent 8 }}
{{- include "sch.affinity.podAntiAffinity" (list .) | nindent 8 }}
{{- if or .Values.global.imagePullSecret.secretName .Values.global.imagePullSecret.username }}
imagePullSecrets:
- name: {{ default (printf "%s-pull-secret" .Release.Name) .Values.global.imagePullSecret.secretName }}
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/web/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ description: |-
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
version: 3.1.0
version: 3.2.0
maintainers:
- name: IBM
- name: Cúram SPM Dev Team
Expand Down
4 changes: 4 additions & 0 deletions helm-charts/web/RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@

# Version History

## v3.2.0

* Adds pod Anti-affinity rules to distribute a replica across the availability zones, and nodes within them.

## v3.1.0

* Add rewrite rule and condition to configmaps to fix verb tampering vulnerability.
Expand Down
1 change: 1 addition & 0 deletions helm-charts/web/templates/_sch-chart-config.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ the Shared Configurable Helpers overridden for this chart.
*/ -}}
{{- define "web.sch.chart.config.values" -}}
sch:
appName: web
chart:
nodeAffinity:
nodeAffinityRequiredDuringScheduling:
Expand Down
20 changes: 20 additions & 0 deletions helm-charts/web/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,26 @@ spec:
{{- include "sch.security.securityContext" (list . .sch.chart.podSecurityContext) | nindent 6 }}
affinity:
{{- include "sch.affinity.nodeAffinity" (list . .sch.chart.nodeAffinity) | nindent 8 }}
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app.kubernetes.io/component
operator: In
values:
- web
topologyKey: topology.kubernetes.io/zone
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app.kubernetes.io/component
operator: In
values:
- web
topologyKey: kubernetes.io/hostname
{{- if or .Values.global.imagePullSecret.secretName .Values.global.imagePullSecret.username }}
imagePullSecrets:
- name: {{ default (printf "%s-pull-secret" .Release.Name) .Values.global.imagePullSecret.secretName }}
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/xmlserver/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ description: |-
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
version: 2.0.3
version: 2.1.0
maintainers:
- name: IBM
- name: Cúram SPM Dev Team
Expand Down
4 changes: 4 additions & 0 deletions helm-charts/xmlserver/RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@

# Version History

## v2.1.0

* Adds pod Anti-affinity rules to distribute a replica across the availability zones, and nodes within them.

## v2.0.3

* Update the charts to internal content verification linter standards.
Expand Down
1 change: 1 addition & 0 deletions helm-charts/xmlserver/templates/_sch-chart-config.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ the Shared Configurable Helpers overridden for this chart.
*/ -}}
{{- define "xmlserver.sch.chart.config.values" -}}
sch:
appName: xmlserver
chart:
nodeAffinity:
nodeAffinityRequiredDuringScheduling:
Expand Down
24 changes: 22 additions & 2 deletions helm-charts/xmlserver/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,29 @@ spec:
annotations:
{{- include "sch.metadata.annotations.metering" (list $ $.sch.chart.metering) | nindent 8 }}
spec:
{{- include "sch.security.securityContext" (list . .sch.chart.podSecurityContext) | indent 6 }}
{{- include "sch.security.securityContext" (list . .sch.chart.podSecurityContext) | nindent 6 }}
affinity:
{{- include "sch.affinity.nodeAffinity" (list . .sch.chart.nodeAffinity) | indent 8 }}
{{- include "sch.affinity.nodeAffinity" (list . .sch.chart.nodeAffinity) | nindent 8 }}
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app.kubernetes.io/component
operator: In
values:
- xmlserver
topologyKey: topology.kubernetes.io/zone
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app.kubernetes.io/component
operator: In
values:
- xmlserver
topologyKey: kubernetes.io/hostname
restartPolicy: {{ .restartPolicy | default "Always" }}
{{- if or .Values.global.imagePullSecret.secretName .Values.global.imagePullSecret.username }}
imagePullSecrets:
Expand Down

0 comments on commit 0f74cdc

Please sign in to comment.