Skip to content

Commit

Permalink
July 2020 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Michele Pegoraro committed Jul 29, 2020
1 parent a75a855 commit ad11271
Show file tree
Hide file tree
Showing 217 changed files with 26,458 additions and 2,903 deletions.
17 changes: 17 additions & 0 deletions .bulldozer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
version: 1

merge:
whitelist:
labels: ["merge when ready"]
comment_substrings: ["==AUTOMERGE==", "==MERGE_WHEN_READY=="]
branches: ["master", "epic/*"]
blacklist:
labels: ["do not merge"]
comment_substrings: ["==DO_NOT_MERGE=="]
method: merge
delete_after_merge: true

update:
whitelist:
labels: ["wip", "update me"]
branches: ["master", "epic/*"]
8 changes: 8 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
root = true

[*]
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 2
12 changes: 7 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ _book
*.tgz
refreshChartMuseum.sh
override_global.yaml
override-values.yaml
helm-charts/*-values.yaml
tls.crt
tls.key
batch-stage
ear-stage
res-stage
*-stage
.dockerignore
dependencies
staticcontent
*!test.txt
Expand All @@ -23,6 +22,9 @@ StaticContent.zip
.project
.settings
*.drawio
/Release-*
build/
!/Jenkins/Pipelines/Build

#GATSBY
# Logs
Expand Down Expand Up @@ -91,4 +93,4 @@ yarn-error.log
.pnp.js
# Yarn Integrity file
.yarn-integrity
package-lock.json
!package-lock.json
108 changes: 91 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,99 @@
language: node_js
node_js:
- "12"
language: generic

group: bluezone
dist: xenial

services:
- docker

env:
global:
- ARTIFACTORY_URL=https://eu.artifactory.swg-devops.com/artifactory
- CHARTS_REPO=wh-spmdevops-helm-virtual
- JFROG_CLI_OFFER_CONFIG=false
matrix:
- CHART_BASENAME=db2
- CHART_BASENAME=dbbuild
- CHART_BASENAME=xmlserver
- CHART_BASENAME=uawebapp
- CHART_BASENAME=apps
- CHART_BASENAME=batch
- CHART_BASENAME=mqserver
- CHART_BASENAME=web
- CHART_BASENAME=openldap

stage: Charts

install:
- npm install -g gatsby markdownlint-cli
- npm install
# Install Helm v3
- curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 > get_helm.sh
- chmod 700 get_helm.sh
- ./get_helm.sh
- helm version
# Install JFrog CLI
- curl -fL https://getcli.jfrog.io | sh
- sudo mv -v jfrog /usr/local/bin/
- helm plugin install https://github.com/chartmuseum/helm-push
# Starts local Chart Museum instance
- docker run -d -e DEBUG=true -p 8080:8080 -e STORAGE=local -e STORAGE_LOCAL_ROOTDIR=/tmp chartmuseum/chartmuseum:v0.12.0
- helm repo add sch https://raw.githubusercontent.com/IBM/charts/master/repo/samples
- helm repo update

script:
- markdownlint **/*.mdx
- gatsby build --prefix-paths
# Validate and package chart
- cd helm-charts/
- helm dependencies update $CHART_BASENAME
- helm lint $CHART_BASENAME
- helm template $CHART_BASENAME
- |
if [ ! "$TRAVIS_BRANCH" == "master" ]; then
perl -i -p -e "s/^version\: (.*)/version\: \1-$TRAVIS_BUILD_NUMBER/" $CHART_BASENAME/Chart.yaml
fi
- helm package $CHART_BASENAME

jobs:
include:
# Build Umbrella Chart
- stage: Umbrella
env:
- CHART_BASENAME=spm
before_script:
# Fake connection to 'local-development' via Chart Museum
- helm repo add local-development http://localhost:8080
- helm repo update
- find helm-charts/ -maxdepth 1 -type d ! -name . ! -name .git ! -name config ! -name jenkinsfiles -exec helm push {} local-development \;
# Build Documentation
- stage: Documentation
language: node_js
node_js:
- "12"
install:
- npm install -g markdownlint-cli
- npm ci
- pip install --user linkchecker
- sed -i "s/TRAVIS_HOST/$(hostname -f)/" linkcheckerrc
script:
- markdownlint **/*.mdx
- npm run build
- docker run --rm -d --name gatsby -p 8888:80 -v $(pwd)/public:/usr/local/apache2/htdocs$SITE_PREFIX httpd:2.4
- linkchecker http://$(hostname -f):8888$SITE_PREFIX --config=./linkcheckerrc
deploy:
provider: pages
skip_cleanup: true
local_dir: public
github_token: $GITHUB_TOKEN
github_url: github.ibm.com
committer_from_gh: true
target_branch: gh-pages
on:
branch: master
after_deploy: skip

deploy:
- provider: pages
skip_cleanup: true
local_dir: public
github_token: $GITHUB_TOKEN
github_url: github.com
committer_from_gh: true
target_branch: gh-pages
on:
branch: master
provider: script
skip_cleanup: true
script: jfrog rt u --url $ARTIFACTORY_URL --apikey $ARTIFACTORY_TOKEN --build-name $TRAVIS_REPO_SLUG --build-number $TRAVIS_JOB_ID ./${CHART_BASENAME}-*.tgz $CHARTS_REPO/
on:
all_branches: true

after_deploy:
- jfrog rt bp --url $ARTIFACTORY_URL --apikey $ARTIFACTORY_TOKEN --build-url https://travis.ibm.com/${TRAVIS_REPO_SLUG}/jobs/${TRAVIS_JOB_ID} $TRAVIS_REPO_SLUG $TRAVIS_JOB_ID
53 changes: 50 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,59 @@

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

## v20.6.1 Changes
## v20.7.0

### Removed

* `configmaps` chart (ConfigMaps are now part of `apps` chart)
* Dockerfile for IBM MQ (custom image not required anymore - use `ibmcom/mq` directly)
* Removed Helm v2, and related tiller documentation and commands

### Added

* Integration with [IBM Security Access manager](https://www.ibm.com/ie-en/marketplace/access-management/details)
* Dependency on IBM [Shared Configuration Helper](https://github.com/IBM/charts/tree/master/samples/ibm-sch) (SCH) chart for aligning with CloudPak code standards
* Dockerfile for a utilities image (used as init containers to import certificates into keystores & wait for other components to become available)
* Chart hooks for managing LTPA keys and MQ client user
* Liberty runtime liveness probe (checks log for specific error messages)
* Instructions for handling failed JMS messages on the MQ dead message queue
* In the MQ chart, a check before creating deployment to see if multi-instance MQ is desired.
* Values for use in multi-instance MQ, with both static and dynamic storage.
* A stateful set YAML file for use in multi-instance MQ.
* PV and PVC YAML files for use in multi-instance MQ.

### Changed

* Reduced the privilege requirement of `apps` chart to run with the `restricted` policy
* Reduced the privilege requirement of `batch` chart to run with the `restricted` policy
* Reduced the privilege requirement of `xmlserver` chart to run with the `restricted` policy
* Renamed `ihs` chart to `web` and switched to Apache HTTP server
* Renamed `ce-app` chart to `uawebapp` and switched to Apache HTTP server
* Moved web server configuration to ConfigMaps for `uawebapp` and `web` charts
* Added facility to add multiple batch programs
* Allow the generated UID in OpenShift to run the Liberty runtime
* Changed value file to allow specifying the `storageClassName` when using persistence
* Included database connection override values in `crc-values.yaml`, `iks-values.yaml` and `minikube-values.yaml`
* Updated minikube version to `1.12`
* Updated kubectl version to `1.18`
* Updated Helm to `v3`
* Updated IBM MQ Resource Adapter to `v9.1.5.0`

### Fixed

* Incorrect formatting of heredoc in `createSSC.sh` ([#24](https://github.com/IBM/spm-kubernetes/issues/24))
* Db2 dependency in `spm/requirements.yaml` ([#23](https://github.com/IBM/spm-kubernetes/issues/23))
* Duplicate `ihs` elements in `spm/values.yaml` ([#15](https://github.com/IBM/spm-kubernetes/issues/15))


## v20.6.1

### Changed

* Updated URL format to match path prefix used by Gatsby build

## v20.6.0 Changes

## v20.6.0

### Added

Expand All @@ -29,7 +75,8 @@ All notable changes to this project will be documented in this file.

* [Broken Links in Prerequisites.](https://github.com/IBM/spm-kubernetes/issues/18)

## v20.5.0 Changes

## v20.5.0

### Added

Expand Down
45 changes: 0 additions & 45 deletions dockerfiles/HTTPServer/CE.Dockerfile

This file was deleted.

40 changes: 12 additions & 28 deletions dockerfiles/HTTPServer/StaticContent.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,22 @@
# limitations under the License.
###############################################################################

ARG DOCKER_REGISTRY="internal.docker.repository"
ARG HTTP_VERSION=9.0.0.11
ARG CONTENT_DIR=CuramStatic

#Unzip static content in to temp
# If set, must end with a forward slash, e.g. "registry.redhat.io/"
ARG BASE_REGISTRY

# Unzip static content in to temp
FROM alpine AS ExplodedStaticzip
COPY StaticContent.zip /tmp/
RUN mkdir -p /work/staticcontent/ \
&& unzip -o -q /tmp/StaticContent.zip -d /work/staticcontent/

#Final
FROM ${DOCKER_REGISTRY}/ubi7/ibm-http-server:${HTTP_VERSION}
ARG HTTP_VERSION
LABEL IHS_VERSION=${HTTP_VERSION}

CMD ["/work/ihsstart.sh"]

USER root
RUN echo "include conf.d/*.conf" >> /opt/IBM/HTTPServer/conf/httpd.conf \
&& chmod g+w /opt/IBM/HTTPServer \
&& chmod -Rc g+w /opt/IBM/HTTPServer/logs \
&& chmod -Rc g+rw /opt/IBM/WebSphere/Plugins/config \
&& chmod -Rc g+rw /opt/IBM/WebSphere/Plugins/logs
&& unzip -o -q /tmp/StaticContent.zip -d /work/staticcontent/ \
&& chmod -R g=u /work/staticcontent

# Provide authority to bind as non-root
RUN setcap CAP_NET_BIND_SERVICE+ep /opt/IBM/HTTPServer/bin/httpd \
&& echo /opt/IBM/HTTPServer/lib > /etc/ld.so.conf.d/httpd-lib.conf \
&& echo /opt/IBM/HTTPServer/gsk8/lib64 >> /etc/ld.so.conf.d/httpd-lib.conf \
&& rm -rf /etc/ld.so.cache \
&& /sbin/ldconfig
# Final
FROM ${BASE_REGISTRY}rhel8/httpd-24
ARG CONTENT_DIR

COPY --from=ExplodedStaticzip /work/staticcontent/WebContent /opt/IBM/HTTPServer/htdocs/CuramStatic
COPY httpdconfig/custom_*.conf /opt/IBM/HTTPServer/conf.d/
COPY ihsstart.sh /work/
COPY --from=ExplodedStaticzip --chown=1001:0 /work/staticcontent/WebContent /var/www/html/$CONTENT_DIR

USER 1000
USER 1001
28 changes: 28 additions & 0 deletions dockerfiles/HTTPServer/UAWebApp.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
###############################################################################
# Copyright 2020 IBM Corporation
#
# 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.
###############################################################################

ARG CONTENT_DIR=universal

# If set, must end with a forward slash, e.g. "registry.redhat.io/"
ARG BASE_REGISTRY

# Final
FROM ${BASE_REGISTRY}rhel8/httpd-24
ARG CONTENT_DIR

COPY --chown=1001:0 build /var/www/html/$CONTENT_DIR

USER 1001
Loading

0 comments on commit ad11271

Please sign in to comment.