Skip to content

Commit 620f4cf

Browse files
Release v0.5.0
Signed-off-by: Florentin Dubois <florentin.dubois@clever-cloud.com>
1 parent cf0db1d commit 620f4cf

File tree

7 files changed

+25
-10
lines changed

7 files changed

+25
-10
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 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.4.0
130+
context: deployments/operator-lifecycle-manager/0.5.0
131131
push: 'true'
132132
tags: clevercloud/clever-operator-manifest:${{ github.sha }}
133-
file: deployments/operator-lifecycle-manager/0.4.0/bundle.Dockerfile
133+
file: deployments/operator-lifecycle-manager/0.5.0/bundle.Dockerfile
134134
kubernetes-deployment-scripts-validation:
135135
name: Kubernetes validate deployment scripts
136136
runs-on: ubuntu-latest

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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.4.0"
6+
version = "0.5.0"
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
@@ -13,7 +13,7 @@ MAINTAINER Florentin Dubois <florentin.dubois@clever-cloud.com>
1313
LABEL name="clever-operator" \
1414
maintainer="Florentin Dubois <florentin.dubois@clever-cloud.com>" \
1515
vendor="Clever Cloud S.A.S" \
16-
version="v0.4.0" \
16+
version="v0.5.0" \
1717
release="1" \
1818
summary="A kubernetes operator that expose clever cloud's resources through custom resource definition" \
1919
description="A kubernetes operator that expose clever cloud's resources through custom resource definition"

Makefile

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,21 @@ DOCKER_OPTS ?= --log-level debug
1111
DOCKER_IMG ?= clevercloud/$(NAME):$(VERSION)
1212

1313
KUBE ?= $(shell which kubectl)
14-
KUBE_SCORE ?= $(shell which kube-score)
1514
KUBE_VERSION ?= v1.21.0
1615

1716
OLM_SDK ?= $(shell which operator-sdk)
1817
OLM_SDK_VERSION ?= 1.15.0
19-
OLM_VERSION ?= 0.4.0
18+
OLM_VERSION ?= 0.5.0
2019

2120
OCP_VALIDATOR ?= $(shell which ocp-olm-catalog-validator)
2221
OCP_VERSION ?= 0.0.1
2322

2423
K8S_VALIDATOR ?= $(shell which k8s-community-bundle-validator)
2524
K8S_VERSION ?= 0.0.1
2625

26+
KUBE_SCORE_VERSION ?= 1.14.0
27+
KUBE_SCORE ?= $(shell which kube-score)
28+
2729
DEPLOY_KUBE ?= deployments/kubernetes/$(KUBE_VERSION)
2830
DEPLOY_OLM ?= deployments/operator-lifecycle-manager/$(OLM_VERSION)
2931

@@ -53,6 +55,7 @@ install-cli-tools:
5355
$(CURL) -L https://github.com/operator-framework/operator-sdk/releases/download/v$(OLM_SDK_VERSION)/operator-sdk_linux_amd64 > $(BIN_DIR)/operator-sdk && $(CHMOD) +x $(BIN_DIR)/operator-sdk
5456
$(CURL) -L https://github.com/redhat-openshift-ecosystem/ocp-olm-catalog-validator/releases/download/v$(OCP_VERSION)/linux-amd64-ocp-olm-catalog-validator > $(BIN_DIR)/ocp-olm-catalog-validator && $(CHMOD) +x $(BIN_DIR)/ocp-olm-catalog-validator
5557
$(CURL) -L https://github.com/k8s-operatorhub/bundle-validator/releases/download/v$(K8S_VERSION)/linux-amd64-k8s-community-bundle-validator > $(BIN_DIR)/k8s-community-bundle-validator && $(CHMOD) +x $(BIN_DIR)/k8s-community-bundle-validator
58+
$(CURL) -L https://github.com/zegl/kube-score/releases/download/v$(KUBE_SCORE_VERSION)/kube-score_$(KUBE_SCORE_VERSION)_linux_amd64 > $(BIN_DIR)/kube-score && $(CHMOD) +x $(BIN_DIR)/kube-score
5659

5760
# ------------------------------------------------------------------------------
5861
# Build docker
@@ -87,6 +90,12 @@ $(DEPLOY_OLM)/manifests/clever-operator-mongodb.crd.yaml:
8790
$(DEPLOY_OLM)/manifests/clever-operator-pulsar.crd.yaml:
8891
$(DIST)/$(NAME) custom-resource-definition view pulsar > $(DEPLOY_OLM)/manifests/clever-operator-pulsar.crd.yaml
8992

93+
$(DEPLOY_OLM)/manifests/clever-operator-elasticsearch.crd.yaml:
94+
$(DIST)/$(NAME) custom-resource-definition view elasticsearch > $(DEPLOY_OLM)/manifests/clever-operator-elasticsearch.crd.yaml
95+
96+
$(DEPLOY_OLM)/manifests/clever-operator-config-provider.crd.yaml:
97+
$(DIST)/$(NAME) custom-resource-definition view config-provider > $(DEPLOY_OLM)/manifests/clever-operator-config-provider.crd.yaml
98+
9099
.PHONY: validate
91100
validate: $(shell $(FIND) -type f -name '*.yaml')
92101
$(KUBE_SCORE) score $(shell $(FIND) $(DEPLOY_KUBE) -type f -name '*.yaml')
@@ -103,12 +112,14 @@ deploy-kubernetes: crd validate deploy-kubernete-crd
103112
$(KUBE) apply -f $(DEPLOY_KUBE)/manifests/clever-operator.clusterserviceversion.yaml
104113

105114
.PHONY: deploy-olm-crd
106-
deploy-olm-crd: crd $(DEPLOY_OLM)/manifests/clever-operator-postgresql.crd.yaml $(DEPLOY_OLM)/manifests/clever-operator-redis.crd.yaml $(DEPLOY_OLM)/manifests/clever-operator-mysql.crd.yaml $(DEPLOY_OLM)/manifests/clever-operator-mongodb.crd.yaml $(DEPLOY_OLM)/manifests/clever-operator-pulsar.crd.yaml validate
115+
deploy-olm-crd: crd $(DEPLOY_OLM)/manifests/clever-operator-elasticsearch.crd.yaml $(DEPLOY_OLM)/manifests/clever-operator-config-provider.crd.yaml $(DEPLOY_OLM)/manifests/clever-operator-postgresql.crd.yaml $(DEPLOY_OLM)/manifests/clever-operator-redis.crd.yaml $(DEPLOY_OLM)/manifests/clever-operator-mysql.crd.yaml $(DEPLOY_OLM)/manifests/clever-operator-mongodb.crd.yaml $(DEPLOY_OLM)/manifests/clever-operator-pulsar.crd.yaml validate
107116
$(KUBE) apply -f $(DEPLOY_OLM)/manifests/clever-operator-postgresql.crd.yaml
108117
$(KUBE) apply -f $(DEPLOY_OLM)/manifests/clever-operator-redis.crd.yaml
109118
$(KUBE) apply -f $(DEPLOY_OLM)/manifests/clever-operator-mysql.crd.yaml
110119
$(KUBE) apply -f $(DEPLOY_OLM)/manifests/clever-operator-mongodb.crd.yaml
111120
$(KUBE) apply -f $(DEPLOY_OLM)/manifests/clever-operator-pulsar.crd.yaml
121+
$(KUBE) apply -f $(DEPLOY_OLM)/manifests/clever-operator-config-provider.crd.yaml
122+
$(KUBE) apply -f $(DEPLOY_OLM)/manifests/clever-operator-elasticsearch.crd.yaml
112123

113124
.PHONY: deploy-olm
114125
deploy-olm: crd validate deploy-olm-crd

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

Lines changed: 3 additions & 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:5821576632c9d524a3f1c419b86346823033c282
143+
- image: clevercloud/clever-operator:5479ce18039bea686c167939eb77a2bc370a0e85
144144
imagePullPolicy: Always
145145
name: clever-operator
146146
command: ["/usr/local/bin/clever-operator"]
@@ -153,9 +153,11 @@ spec:
153153
requests:
154154
memory: 64M
155155
cpu: 100m
156+
ephemeral-storage: 128Mi
156157
limits:
157158
memory: 64M
158159
cpu: 100m
160+
ephemeral-storage: 128Mi
159161
ports:
160162
- containerPort: 8000
161163
protocol: TCP

deployments/operator-lifecycle-manager/0.5.0/manifests/clever-operator.clusterserviceversion.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: operators.coreos.com/v1alpha1
33
kind: ClusterServiceVersion
44
metadata:
5-
name: cleveroperator.v0.4.0
5+
name: cleveroperator.v0.5.0
66
namespace: clever-operator-system
77
annotations:
88
capabilities: Full Lifecycle
@@ -490,9 +490,11 @@ spec:
490490
requests:
491491
memory: 64M
492492
cpu: 100m
493+
ephemeral-storage: 128Mi
493494
limits:
494495
memory: 64M
495496
cpu: 100m
497+
ephemeral-storage: 128Mi
496498
ports:
497499
- containerPort: 8000
498500
protocol: TCP

0 commit comments

Comments
 (0)