Skip to content

Commit ec62d96

Browse files
release: v0.6.0
Signed-off-by: Florentin Dubois <florentin.dubois@clever-cloud.com>
1 parent cca17b7 commit ec62d96

18 files changed

+1319
-7
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
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.5"
6+
version = "0.6.0"
77
edition = "2021"
88
rust-version = "1.84.1"
99
authors = ["Florentin Dubois <florentin.dubois@clever-cloud.com>"]
@@ -17,7 +17,7 @@ async-trait = "^0.1.86"
1717
axum = { version = "^0.8.1", default-features = false, features = ["http1", "tokio", "tracing", "macros", "original-uri", "matched-path", "json"] }
1818
base64 = "^0.22.1"
1919
chrono = { version = "^0.4.39", default-features = false }
20-
clap = { version = "^4.5.29", features = ["derive"] }
20+
clap = { version = "^4.5.30", features = ["derive"] }
2121
clevercloud-sdk = { version = "^0.12.0", features = ["jsonschemas"] }
2222
config = "^0.15.8"
2323
futures = "^0.3.31"

Makefile

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

1717
OLM_SDK ?= $(shell which operator-sdk)
1818
OLM_SDK_VERSION ?= 1.39.1
19-
OLM_VERSION ?= 0.5.5
19+
OLM_VERSION ?= 0.6.0
2020

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

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ Environment variables are:
121121
| Name | Kind | Default | Required | Description |
122122
| ------------------------------------- | --------------- | ------------------------------ |----------|-------------------------------------------------------------------|
123123
| `CLEVER_OPERATOR_OPERATOR_LISTEN` | `SocketAddress` | `0.0.0.0:7080` | yes | |
124-
| `CLEVER_OPERATOR_API_ENDPOINT` | `Url` | `https://api.clever-cloud.com` | yes | |
125124
| `CLEVER_OPERATOR_API_SECRET` | `String` | none | false | |
126125
| `CLEVER_OPERATOR_API_TOKEN` | `String` | none | yes | if used alone, we assume that we are using oauthless auth backend |
127126
| `CLEVER_OPERATOR_API_CONSUMER_KEY` | `String` | none | false | |

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.2.0
6-
appVersion: "0.5.5"
6+
appVersion: "0.6.0"

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: "caa1e6bd53de7c882fc5bcc4043b6ec92c3e290b"
18+
tag: "ca53fedf01d1f813df6f061ef511b6e576084531"
1919

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

deployments/kubernetes/v1.30.0/20-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ spec:
136136
secret:
137137
secretName: clever-operator-configuration
138138
containers:
139-
- image: clevercloud/clever-operator:f246f5973b4ed449615fd1f585d81c8acce3bff2
139+
- image: clevercloud/clever-operator:ca53fedf01d1f813df6f061ef511b6e576084531
140140
imagePullPolicy: Always
141141
name: clever-operator
142142
command: ["/usr/local/bin/clever-operator"]
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.12
19+
20+
# Copy files to locations specified by labels.
21+
ADD manifests /manifests/
22+
ADD metadata /metadata/
23+
ADD tests/scorecard /tests/scorecard/
24+
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: configproviders.api.clever-cloud.com
5+
spec:
6+
group: api.clever-cloud.com
7+
names:
8+
categories: []
9+
kind: ConfigProvider
10+
plural: configproviders
11+
shortNames:
12+
- cp
13+
singular: configprovider
14+
scope: Namespaced
15+
versions:
16+
- additionalPrinterColumns:
17+
- description: Organisation
18+
jsonPath: .spec.organisation
19+
name: organisation
20+
type: string
21+
- description: Addon
22+
jsonPath: .status.addon
23+
name: addon
24+
type: string
25+
name: v1
26+
schema:
27+
openAPIV3Schema:
28+
description: Auto-generated derived type for Spec via `CustomResource`
29+
properties:
30+
spec:
31+
properties:
32+
organisation:
33+
type: string
34+
variables:
35+
additionalProperties:
36+
type: string
37+
type: object
38+
required:
39+
- organisation
40+
- variables
41+
type: object
42+
status:
43+
nullable: true
44+
properties:
45+
addon:
46+
nullable: true
47+
type: string
48+
type: object
49+
required:
50+
- spec
51+
title: ConfigProvider
52+
type: object
53+
served: true
54+
storage: true
55+
subresources:
56+
status: {}
Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: elasticsearches.api.clever-cloud.com
5+
spec:
6+
group: api.clever-cloud.com
7+
names:
8+
categories: []
9+
kind: ElasticSearch
10+
plural: elasticsearches
11+
shortNames:
12+
- es
13+
singular: elasticsearch
14+
scope: Namespaced
15+
versions:
16+
- additionalPrinterColumns:
17+
- description: Organisation
18+
jsonPath: .spec.organisation
19+
name: organisation
20+
type: string
21+
- description: Addon
22+
jsonPath: .status.addon
23+
name: addon
24+
type: string
25+
- description: Region
26+
jsonPath: .spec.instance.region
27+
name: region
28+
type: string
29+
- description: Instance
30+
jsonPath: .spec.instance.plan
31+
name: instance
32+
type: string
33+
- description: Version
34+
jsonPath: .spec.options.version
35+
name: version
36+
type: integer
37+
- description: Cold encryption
38+
jsonPath: .spec.options.encryption
39+
name: encrypted
40+
type: boolean
41+
- description: Kibana
42+
jsonPath: .spec.options.kibana
43+
name: kibana
44+
type: boolean
45+
- description: Application Perfomance Monitoring
46+
jsonPath: .spec.options.apm
47+
name: apm
48+
type: boolean
49+
name: v1
50+
schema:
51+
openAPIV3Schema:
52+
description: Auto-generated derived type for Spec via `CustomResource`
53+
properties:
54+
spec:
55+
properties:
56+
instance:
57+
properties:
58+
plan:
59+
type: string
60+
region:
61+
type: string
62+
required:
63+
- plan
64+
- region
65+
type: object
66+
options:
67+
properties:
68+
apm:
69+
type: boolean
70+
encryption:
71+
type: boolean
72+
kibana:
73+
type: boolean
74+
version:
75+
enum:
76+
- 6
77+
- 7
78+
- 8
79+
type: integer
80+
required:
81+
- apm
82+
- encryption
83+
- kibana
84+
- version
85+
type: object
86+
organisation:
87+
type: string
88+
required:
89+
- instance
90+
- options
91+
- organisation
92+
type: object
93+
status:
94+
nullable: true
95+
properties:
96+
addon:
97+
nullable: true
98+
type: string
99+
type: object
100+
required:
101+
- spec
102+
title: ElasticSearch
103+
type: object
104+
served: true
105+
storage: true
106+
subresources:
107+
status: {}
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: kvs.api.clever-cloud.com
5+
spec:
6+
group: api.clever-cloud.com
7+
names:
8+
categories: []
9+
kind: KV
10+
plural: kvs
11+
shortNames: []
12+
singular: kv
13+
scope: Namespaced
14+
versions:
15+
- additionalPrinterColumns:
16+
- description: Organisation
17+
jsonPath: .spec.organisation
18+
name: organisation
19+
type: string
20+
- description: Addon
21+
jsonPath: .status.addon
22+
name: addon
23+
type: string
24+
- description: Region
25+
jsonPath: .spec.instance.region
26+
name: region
27+
type: string
28+
name: v1alpha1
29+
schema:
30+
openAPIV3Schema:
31+
description: Auto-generated derived type for Spec via `CustomResource`
32+
properties:
33+
spec:
34+
properties:
35+
instance:
36+
properties:
37+
region:
38+
type: string
39+
required:
40+
- region
41+
type: object
42+
organisation:
43+
type: string
44+
required:
45+
- instance
46+
- organisation
47+
type: object
48+
status:
49+
nullable: true
50+
properties:
51+
addon:
52+
nullable: true
53+
type: string
54+
type: object
55+
required:
56+
- spec
57+
title: KV
58+
type: object
59+
served: true
60+
storage: true
61+
subresources:
62+
status: {}

0 commit comments

Comments
 (0)