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 #739 from kaczyns/v091rc1
Browse files Browse the repository at this point in the history
v0.9.1-rc.1
  • Loading branch information
kaczyns authored May 28, 2020
2 parents 8d4705b + 9d1a3d2 commit aaef607
Show file tree
Hide file tree
Showing 10 changed files with 1,782 additions and 19 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: 1348e90cc3269b6e65837f71011bef6f0dc662781a41442cb5ce3714cb91b890
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-rc.2/default-kabanero-pipelines.tar.gz
16 changes: 8 additions & 8 deletions config/samples/full.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ 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
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: 1348e90cc3269b6e65837f71011bef6f0dc662781a41442cb5ce3714cb91b890
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-rc.2/default-kabanero-pipelines.tar.gz

gitops:
pipelines:
- id: gitops
sha256: 683e8a05482a166ad4d76b6358227d3807a66e7edd8bc80483d6a88bca6c4095
sha256: 2b0f31cfb31f49454e68542deb301a98c409d8c2a233c6b8a32eb476090c2cd6
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-rc.2/kabanero-gitops-pipelines.tar.gz

governancePolicy:
# Provide governance configuration for all stacks managed by Kabanero. The allowed configuration policies are:
Expand Down
34 changes: 30 additions & 4 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.0"
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 @@ -143,11 +154,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 @@ -170,11 +186,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 @@ -197,11 +218,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
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: collections.kabanero.io
spec:
additionalPrinterColumns:
- JSONPath: .metadata.creationTimestamp
description: CreationTimestamp is a timestamp representing the server time when
this object was created. It is not guaranteed to be set in happens-before order
across separate operations.
name: Age
type: date
- JSONPath: .status.status
description: Collection status.
name: Status
type: string
group: kabanero.io
names:
kind: Collection
listKind: CollectionList
plural: collections
singular: collection
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: Collection is the Schema for the collections API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: CollectionSpec defines the desired composition of a Collection
properties:
desiredState:
type: string
name:
type: string
repositoryUrl:
type: string
skipCertVerification:
type: boolean
version:
type: string
versions:
items:
description: CollectionVersion defines the desired composition of
a specific collection version.
properties:
desiredState:
type: string
repositoryUrl:
type: string
skipCertVerification:
type: boolean
version:
type: string
type: object
type: array
type: object
status:
description: CollectionStatus defines the observed state of a collection
properties:
activeLocation:
type: string
activePipelines:
items:
description: PipelineStatus defines the observed state of the assets
located within a single pipeline .tar.gz.
properties:
activeAssets:
items:
description: RepositoryAssetStatus defines the observed state
of a single asset in a respository, in the collection.
properties:
assetDigest:
type: string
assetName:
type: string
group:
type: string
kind:
type: string
namespace:
type: string
status:
type: string
statusMessage:
type: string
version:
type: string
type: object
type: array
digest:
type: string
name:
type: string
url:
type: string
required:
- digest
- name
- url
type: object
type: array
activeVersion:
type: string
availableLocation:
type: string
availableVersion:
type: string
images:
items:
description: Image defines a container image used by a collection
properties:
id:
type: string
image:
type: string
type: object
type: array
status:
type: string
statusMessage:
type: string
versions:
items:
description: CollectionVersionStatus defines the observed state of
a specific collection version.
properties:
images:
items:
description: Image defines a container image used by a collection
properties:
id:
type: string
image:
type: string
type: object
type: array
location:
type: string
pipelines:
items:
description: PipelineStatus defines the observed state of the
assets located within a single pipeline .tar.gz.
properties:
activeAssets:
items:
description: RepositoryAssetStatus defines the observed
state of a single asset in a respository, in the collection.
properties:
assetDigest:
type: string
assetName:
type: string
group:
type: string
kind:
type: string
namespace:
type: string
status:
type: string
statusMessage:
type: string
version:
type: string
type: object
type: array
digest:
type: string
name:
type: string
url:
type: string
required:
- digest
- name
- url
type: object
type: array
status:
type: string
statusMessage:
type: string
version:
type: string
type: object
type: array
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
Loading

0 comments on commit aaef607

Please sign in to comment.