Skip to content
This repository has been archived by the owner on Aug 2, 2023. It is now read-only.

Commit

Permalink
Merge pull request #750 from kaczyns/v091master
Browse files Browse the repository at this point in the history
Roll 0.9.1 info into master
  • Loading branch information
kaczyns authored Jun 15, 2020
2 parents b555e35 + 9f95bbd commit 74078d5
Show file tree
Hide file tree
Showing 10 changed files with 1,789 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ IMAGE_SHA = $(lastword $(subst @, ,$(IMAGE_REPO_DIGEST)))
REGISTRY_IMAGE_SHA = $(lastword $(subst @, ,$(REGISTRY_IMAGE_REPO_DIGEST)))

# Current release (used for CSV management)
CURRENT_RELEASE=0.9.0
CURRENT_RELEASE=0.9.1

# OS detection
ifeq ($(OS),Windows_NT)
Expand Down
6 changes: 3 additions & 3 deletions config/samples/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ kind: Kabanero
metadata:
name: kabanero
spec:
version: "0.9.0"
version: "0.9.1"
stacks:
repositories:
- name: central
https:
url: https://github.com/kabanero-io/kabanero-stack-hub/releases/download/0.9.0/kabanero-stack-hub-index.yaml
pipelines:
- id: default
sha256: 63b98242b60f6a1cf240b430d24659b9727d16013935553a798be1e6c122c479
sha256: deb5162495e1fe60ab52632f0879f9c9b95e943066590574865138791cbe948f
https:
url: https://github.com/kabanero-io/kabanero-pipelines/releases/download/0.9.0/default-kabanero-pipelines.tar.gz
url: https://github.com/kabanero-io/kabanero-pipelines/releases/download/0.9.1/default-kabanero-pipelines.tar.gz
22 changes: 11 additions & 11 deletions config/samples/full.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ metadata:
spec:
# The platform version determines the desired version for all components, but those
# can be overriden individually as well
version: "0.9.0"
version: "0.9.1"

targetNamespaces:
- kabanero

cliServices:
# Overrides the setting for version on this component
version: "0.9.0"
version: "0.9.1"

# Overrides the image as a separate repository or tag
repository: kabanero/kabanero-command-line-services
tag: "0.9.0"
tag: "0.9.1"

# Overrides the image uri
image: kabanero/kabanero-command-line-services:0.9.0
image: kabanero/kabanero-command-line-services:0.9.1

# Indicates the token expiration time
# Specify a positive integer followed by a unit of time, which can be hours (h), minutes (m), or seconds (s).
Expand All @@ -33,7 +33,7 @@ spec:

collectionController:
# Overrides the setting for version on this component
version: "0.9.0"
version: "0.9.1"

# Overrides the image as a separate repository or tag
repository: kabanero/kabanero-operator
Expand All @@ -44,7 +44,7 @@ spec:

stackController:
# Overrides the setting for version on this component
version: "0.9.0"
version: "0.9.1"

# Overrides the image as a separate repository or tag
repository: kabanero/kabanero-operator
Expand All @@ -69,7 +69,7 @@ spec:

admissionControllerWebhook:
# Overrides the setting for version on this component
version: "0.9.0"
version: "0.9.1"

# Overrides the image as a separate repository or tag
repository: kabanero/kabanero-operator
Expand Down Expand Up @@ -120,16 +120,16 @@ spec:
url: https://github.com/kabanero-io/kabanero-stack-hub/releases/download/0.9.0/kabanero-stack-hub-index.yaml
pipelines:
- id: default
sha256: 63b98242b60f6a1cf240b430d24659b9727d16013935553a798be1e6c122c479
sha256: deb5162495e1fe60ab52632f0879f9c9b95e943066590574865138791cbe948f
https:
url: https://github.com/kabanero-io/kabanero-pipelines/releases/download/0.9.0/default-kabanero-pipelines.tar.gz
url: https://github.com/kabanero-io/kabanero-pipelines/releases/download/0.9.1/default-kabanero-pipelines.tar.gz

gitops:
pipelines:
- id: gitops
sha256: 683e8a05482a166ad4d76b6358227d3807a66e7edd8bc80483d6a88bca6c4095
sha256: 7996bf29f338f8154e9c7db977833bf33d0a6d4e228109fab411d3b38ed4b99e
https:
url: https://github.com/kabanero-io/kabanero-pipelines/releases/download/0.9.0/kabanero-gitops-pipelines.tar.gz
url: https://github.com/kabanero-io/kabanero-pipelines/releases/download/0.9.1/kabanero-gitops-pipelines.tar.gz

governancePolicy:
# Provide governance configuration for all stacks managed by Kabanero. The allowed configuration policies are:
Expand Down
42 changes: 34 additions & 8 deletions config/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,21 @@

# When the Kabanero instance does not specify which version of Kabanero to use,
# this is the value
default: "0.9.0"
default: "0.9.1"

# Top level: relates Kabanero versions to software versions
kabanero:
- version: "0.9.1"
related-versions:
cli-services: "0.9.1"
landing: "0.9.0"
events: "0.9.0"
collection-controller: "0.9.1"
stack-controller: "0.9.1"
admission-webhook: "0.9.1"
sso: "7.3.2"
codeready-workspaces: "0.9.0"

- version: "0.9.0"
related-versions:
cli-services: "0.9.0"
Expand Down Expand Up @@ -92,11 +103,11 @@ related-software:
tag: "0.6.0"

cli-services:
- version: "go-prototype"
orchestrations: "orchestrations/cli-services/0.3"
- version: "0.9.1"
orchestrations: "orchestrations/cli-services/0.2"
identifiers:
repository: "davco01a/kabanero-command-line-services"
tag: "latest"
repository: "kabanero/kabanero-command-line-services"
tag: "0.9.1"
- version: "0.9.0"
orchestrations: "orchestrations/cli-services/0.2"
identifiers:
Expand Down Expand Up @@ -148,11 +159,16 @@ related-software:
tag: "0.1"

collection-controller:
- version: "0.9.0"
- version: "0.9.1"
orchestrations: "orchestrations/collection-controller/0.1"
identifiers:
repository: "FROM_POD"
tag: "FROM_POD"
- version: "0.9.0"
orchestrations: "orchestrations/collection-controller/0.1"
identifiers:
repository: "kabanero/kabanero-operator"
tag: "0.9.0"
- version: "0.8.0"
orchestrations: "orchestrations/collection-controller/0.1"
identifiers:
Expand All @@ -175,11 +191,16 @@ related-software:
tag: "0.6.0"

stack-controller:
- version: "0.9.0"
- version: "0.9.1"
orchestrations: "orchestrations/stack-controller/0.1"
identifiers:
repository: "FROM_POD"
tag: "FROM_POD"
- version: "0.9.0"
orchestrations: "orchestrations/stack-controller/0.1"
identifiers:
repository: "kabanero/kabanero-operator"
tag: "0.9.0"
- version: "0.8.0"
orchestrations: "orchestrations/stack-controller/0.1"
identifiers:
Expand All @@ -202,11 +223,16 @@ related-software:
tag: "0.6.0"

admission-webhook:
- version: "0.9.0"
- version: "0.9.1"
orchestrations: "orchestrations/admission-webhook/0.2"
identifiers:
repository: "FROM_POD"
tag: "FROM_POD"
- version: "0.9.0"
orchestrations: "orchestrations/admission-webhook/0.2"
identifiers:
repository: "kabanero/kabanero-operator"
tag: "0.9.0"
- version: "0.8.0"
orchestrations: "orchestrations/admission-webhook/0.2"
identifiers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
capabilities: Basic Install
categories: "Integration & Delivery"
certified: "false"
containerImage: kabanero/kabanero-operator:latest
containerImage: kabanero/kabanero-operator@sha256:3ec321bb84127e108d4f65b6d2c97f102072b7622fa545ce1a78ef6935c2f3a8
createdAt: 2019-11-19T12:00:00.000-0500
description: Bringings together foundational open source technologies into a modern microservices-based framework.
olm.skipRange: '>=0.6.1 <0.9.0'
Expand Down Expand Up @@ -302,7 +302,7 @@ spec:
fieldPath: metadata.name
- name: OPERATOR_NAME
value: kabanero-operator
image: kabanero/kabanero-operator:latest
image: kabanero/kabanero-operator@sha256:3ec321bb84127e108d4f65b6d2c97f102072b7622fa545ce1a78ef6935c2f3a8
imagePullPolicy: Always
name: kabanero-operator
resources: {}
Expand Down Expand Up @@ -332,3 +332,12 @@ spec:
type: AllNamespaces
provider:
name: IBM
relatedImages:
- image: kabanero/kabanero-command-line-services:0.9.0
name: cli-services-0.9.0
- image: kabanero/landing:0.9.0
name: landing-0.9.0
- image: kabanero/events-operator:0.1.0
name: events-0.9.0
- image: kabanero/che-devfile-registry:0.11.0
name: codeready-workspaces-0.9.0
Loading

0 comments on commit 74078d5

Please sign in to comment.