Skip to content

Commit ae9e039

Browse files
FlorentinDUBOISFlorentinDUBOIS
authored
Merge pull request #85 from CleverCloud/devel/fdubois/release/v0.5.2
Release v0.5.2
2 parents e7ad0b4 + 10ffcf4 commit ae9e039

18 files changed

+1076
-9
lines changed

‎.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ jobs:
127127
password: ${{ secrets.DOCKERHUB_TOKEN }}
128128
- uses: docker/build-push-action@v2
129129
with:
130-
context: deployments/operator-lifecycle-manager/0.5.1
130+
context: deployments/operator-lifecycle-manager/0.5.2
131131
push: 'true'
132132
tags: clevercloud/clever-operator-manifest:${{ github.sha }}
133-
file: deployments/operator-lifecycle-manager/0.5.1/bundle.Dockerfile
133+
file: deployments/operator-lifecycle-manager/0.5.2/bundle.Dockerfile
134134
kubernetes-deployment-scripts-validation:
135135
name: Kubernetes validate deployment scripts
136136
runs-on: ubuntu-latest
@@ -159,7 +159,7 @@ jobs:
159159
steps:
160160
- uses: actions/checkout@v2
161161
- uses: medyagh/setup-minikube@master
162-
- run: curl -L -vvv https://github.com/operator-framework/operator-sdk/releases/download/v1.15.0/operator-sdk_linux_amd64 > /tmp/operator-sdk && chmod +x /tmp/operator-sdk
162+
- run: curl -L -vvv https://github.com/operator-framework/operator-sdk/releases/download/v1.20.1/operator-sdk_linux_amd64 > /tmp/operator-sdk && chmod +x /tmp/operator-sdk
163163
- run: /tmp/operator-sdk olm install --verbose --timeout 30m
164164
- run: /tmp/operator-sdk run bundle --verbose --timeout 30m 'docker.io/clevercloud/clever-operator-manifest:${{ github.sha }}'
165165
...

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[package]
44
name = "clever-operator"
55
description = "A kubernetes operator that expose clever cloud's resources through custom resource definition"
6-
version = "0.5.1"
6+
version = "0.5.2"
77
edition = "2021"
88
rust-version = "1.60.0"
99
authors = ["Florentin Dubois <florentin.dubois@clever-cloud.com>"]

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ MAINTAINER Florentin Dubois <florentin.dubois@clever-cloud.com>
1616
LABEL name="clever-operator" \
1717
maintainer="Florentin Dubois <florentin.dubois@clever-cloud.com>" \
1818
vendor="Clever Cloud S.A.S" \
19-
version="v0.5.1" \
19+
version="v0.5.2" \
2020
release="1" \
2121
summary="A kubernetes operator that expose clever cloud's resources through custom resource definition" \
2222
description="A kubernetes operator that expose clever cloud's resources through custom resource definition"

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ KUBE_VERSION ?= v1.21.0
1616

1717
OLM_SDK ?= $(shell which operator-sdk)
1818
OLM_SDK_VERSION ?= 1.20.1
19-
OLM_VERSION ?= 0.5.1
19+
OLM_VERSION ?= 0.5.2
2020

2121
OCP_VALIDATOR ?= $(shell which ocp-olm-catalog-validator)
2222
OCP_VERSION ?= 0.0.1

‎deployments/kubernetes/helm/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ name: clever-operator
33
description: A kubernetes operator that expose clever cloud's resources through custom resource definition
44
type: application
55
version: 0.1.0
6-
appVersion: "0.5.1"
6+
appVersion: "0.5.2"

‎deployments/kubernetes/helm/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ image:
1515
repository: clevercloud/clever-operator
1616
pullPolicy: Always
1717
# Overrides the image tag whose default is the chart appVersion.
18-
tag: "c00666a3f9911221a313a3f387d9561f77da0384"
18+
tag: "e7ad0b4cfee00dd526f0e1b9aec90d79ee2ed123"
1919

2020
# Declare your secrets for the operator to create add-ons on Clever Cloud
2121
config:

‎deployments/kubernetes/v1.21.0/20-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ spec:
140140
- key: "config.toml"
141141
path: "config.toml"
142142
containers:
143-
- image: clevercloud/clever-operator:c00666a3f9911221a313a3f387d9561f77da0384
143+
- image: clevercloud/clever-operator:e7ad0b4cfee00dd526f0e1b9aec90d79ee2ed123
144144
imagePullPolicy: Always
145145
name: clever-operator
146146
command: ["/usr/local/bin/clever-operator"]

‎deployments/operator-lifecycle-manager/0.5.2/bundle.Dockerfile

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# See https://github.com/operator-framework/operator-registry/blob/master/docs/design/operator-bundle.md#Bundle-Dockerfile
2+
3+
FROM scratch
4+
5+
# Core bundle labels.
6+
LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
7+
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
8+
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
9+
LABEL operators.operatorframework.io.bundle.package.v1=clever-operator
10+
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
11+
LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
12+
13+
# Labels for testing.
14+
LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
15+
LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
16+
17+
# Label for OpenShift.
18+
LABEL com.redhat.openshift.versions=v4.6-v4.9
19+
20+
# Copy files to locations specified by labels.
21+
ADD manifests /manifests/
22+
ADD metadata /metadata/
23+
ADD tests/scorecard /tests/scorecard/
24+

‎deployments/operator-lifecycle-manager/0.5.2/manifests/clever-operator-config-elasticsearch.crd.yaml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
---
2+
apiVersion: apiextensions.k8s.io/v1
3+
kind: CustomResourceDefinition
4+
metadata:
5+
name: elasticsearches.api.clever-cloud.com
6+
spec:
7+
group: api.clever-cloud.com
8+
names:
9+
categories: []
10+
kind: ElasticSearch
11+
plural: elasticsearches
12+
shortNames:
13+
- es
14+
singular: elasticsearch
15+
scope: Namespaced
16+
versions:
17+
- additionalPrinterColumns: []
18+
name: v1
19+
schema:
20+
openAPIV3Schema:
21+
description: "Auto-generated derived type for Spec via `CustomResource`"
22+
properties:
23+
spec:
24+
properties:
25+
instance:
26+
properties:
27+
plan:
28+
type: string
29+
region:
30+
type: string
31+
required:
32+
- plan
33+
- region
34+
type: object
35+
options:
36+
properties:
37+
apm:
38+
type: boolean
39+
encryption:
40+
type: boolean
41+
kibana:
42+
type: boolean
43+
version:
44+
enum:
45+
- 6
46+
- 7
47+
type: integer
48+
required:
49+
- apm
50+
- encryption
51+
- kibana
52+
- version
53+
type: object
54+
organisation:
55+
type: string
56+
required:
57+
- instance
58+
- options
59+
- organisation
60+
type: object
61+
status:
62+
nullable: true
63+
properties:
64+
addon:
65+
nullable: true
66+
type: string
67+
type: object
68+
required:
69+
- spec
70+
title: ElasticSearch
71+
type: object
72+
served: true
73+
storage: true
74+
subresources:
75+
status: {}

‎deployments/operator-lifecycle-manager/0.5.2/manifests/clever-operator-config-provider.crd.yaml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
---
2+
apiVersion: apiextensions.k8s.io/v1
3+
kind: CustomResourceDefinition
4+
metadata:
5+
name: configproviders.api.clever-cloud.com
6+
spec:
7+
group: api.clever-cloud.com
8+
names:
9+
categories: []
10+
kind: ConfigProvider
11+
plural: configproviders
12+
shortNames:
13+
- cp
14+
singular: configprovider
15+
scope: Namespaced
16+
versions:
17+
- additionalPrinterColumns: []
18+
name: v1
19+
schema:
20+
openAPIV3Schema:
21+
description: "Auto-generated derived type for Spec via `CustomResource`"
22+
properties:
23+
spec:
24+
properties:
25+
organisation:
26+
type: string
27+
variables:
28+
additionalProperties:
29+
type: string
30+
type: object
31+
required:
32+
- organisation
33+
- variables
34+
type: object
35+
status:
36+
nullable: true
37+
properties:
38+
addon:
39+
nullable: true
40+
type: string
41+
type: object
42+
required:
43+
- spec
44+
title: ConfigProvider
45+
type: object
46+
served: true
47+
storage: true
48+
subresources:
49+
status: {}

0 commit comments

Comments
 (0)