Skip to content

Commit

Permalink
Merge pull request #229 from IBM/prep0.9.4
Browse files Browse the repository at this point in the history
prepare 0.9.4 release
  • Loading branch information
jhart1685 authored Dec 7, 2020
2 parents 57d7bad + 1e1133a commit cf91952
Show file tree
Hide file tree
Showing 9 changed files with 191 additions and 81 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
Notable changes recorded here.
This project adheres to [Semantic Versioning](http://semver.org/).

# v0.9.2next
# v0.9.4
## 2020-12-06
* Update to go 1.14.12
* Support OpenShift projects which create deployments with blank image names ([#227](https://github.com/IBM/portieris/issues/227))
* add webHooks.failurePolicy value/option

# v0.9.2
## 2020-11-30
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.2 as golang
FROM golang:1.14.12 as golang

WORKDIR /go/src/github.com/IBM/portieris
RUN mkdir -p /go/src/github.com/IBM/portieris
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GOFILES=$(shell find . -type f -name '*.go' -not -path "./code-generator/*")
GOPACKAGES=$(shell go list ./... | grep -v test/ | grep -v pkg/apis/)

VERSION=0.9.2next
VERSION=0.9.4
TAG=$(VERSION)
GOTAGS='containers_image_openpgp'

Expand Down
5 changes: 3 additions & 2 deletions RELEASE-HOWTO.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ A runbook style document for project owners to have some consistency in the proc

## Version Number
Each release will see an increment in the version number acording to [SEMVER](https://semver.org/)
Releases will be even minor numbers, odd minor numbers indicate development version (building toward next even number release)

## Release Process
1. Update VERSION in Makefile, Chart.yaml and values.yaml to the intended release version. Check the CHANGELOG.md references the right version and date.
1. Update VERSION in Makefile, Chart.yaml and values.yaml to the intended (even minor version) release version. Check the CHANGELOG.md references the right version and date.
1. Run make alltests
1. Run make e2e or helm.install & e2e.quick
1. Publish the image to dockerhub (currently).
Expand All @@ -15,4 +16,4 @@ Each release will see an increment in the version number acording to [SEMVER](ht
1. Create a release with the chart as a release artifact.

## Post Release
1. As the first commit after release update VERSION in Makefile, version in Chart.yaml, heading in CHNAGELOG.md, and tag in values.yaml with the suffix 'next' such that so that further commits are clearly contributions to the next release. Consequently installers from source helm should check out the release tag commit to find the appropriate image by default.
1. As the first commit after release update VERSION in Makefile, version in Chart.yaml, heading in CHANGELOG.md, and tag in values.yaml to the next odd minor version number to indicate that further commits are clearly contributions to the next release. Consequently installers from source helm should check out the release tag commit to find the appropriate image by default.
14 changes: 6 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/IBM/portieris
go 1.13

require (
github.com/IBM/go-sdk-core/v4 v4.6.0
github.com/IBM/go-sdk-core/v4 v4.9.0
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
github.com/bitly/go-hostpool v0.1.0 // indirect
Expand All @@ -12,24 +12,22 @@ require (
github.com/bugsnag/bugsnag-go v1.5.3 // indirect
github.com/bugsnag/panicwrap v1.2.0 // indirect
github.com/cloudflare/cfssl v1.5.0 // indirect
github.com/containers/image/v5 v5.1.0
github.com/docker/distribution v0.0.0-20170817175659-5f6282db7d65
github.com/containers/image/v5 v5.8.1
github.com/docker/distribution v2.7.1+incompatible
github.com/docker/go v1.5.1-1 // indirect
github.com/go-sql-driver/mysql v1.5.0 // indirect
github.com/gofrs/uuid v3.2.0+incompatible // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/googleapis/gnostic v0.4.0 // indirect
github.com/gorilla/mux v1.7.3
github.com/gorilla/mux v1.7.4
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/jinzhu/gorm v1.9.12 // indirect
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
github.com/kubernetes/apiextensions-apiserver v0.0.0-20181121072900-e8a638592964
github.com/miekg/pkcs11 v0.0.0-20181023194645-95e2e42e3ece // indirect
github.com/mtrmac/gpgme v0.1.2 // indirect
github.com/onsi/ginkgo v1.11.0
github.com/onsi/gomega v1.8.1
github.com/onsi/ginkgo v1.14.2
github.com/onsi/gomega v1.10.3
github.com/prometheus/client_golang v1.8.0
github.com/satori/go.uuid v1.2.0
github.com/stretchr/testify v1.6.1
Expand Down
234 changes: 169 additions & 65 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion helm/portieris/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: portieris
version: 0.9.2next
version: 0.9.4
description: Admission Controller webhook for enforcing image trust in your cluster
maintainer:
- [email protected]
Expand Down
2 changes: 1 addition & 1 deletion helm/portieris/templates/webhooks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ webhooks:
apiGroups: ["*"]
apiVersions: ["*"]
resources: ["pods", "deployments", "replicationcontrollers", "replicasets", "daemonsets", "statefulsets", "jobs", "cronjobs"]
failurePolicy: Fail
failurePolicy: {{ .Values.webHooks.failurePolicy }}
sideEffects: None
admissionReviewVersions: ["v1beta1"]
{{ if .Values.AllowAdmissionSkip }}
Expand Down
5 changes: 4 additions & 1 deletion helm/portieris/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ image:
host:
pullSecret:
image: portieris
tag: 0.9.2next
tag: 0.9.4
pullPolicy: Always

service:
Expand All @@ -20,6 +20,9 @@ service:
securityContext:
runAsUser: 1000060001

webHooks:
failurePolicy: Fail

# If not running on IBM Cloud Container Service set to false
IBMContainerService: true

Expand Down

0 comments on commit cf91952

Please sign in to comment.