Merge pull request #120 from CleverCloud/devel/fdubois/feat/updates

feat: updates dependencies. deployments and documentation

Author: FlorentinDUBOIS

.github/workflows/ci.yml

@@ -126,16 +126,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: docker/setup-qemu-action@v1
-      - uses: docker/setup-buildx-action@v1
-      - uses: docker/login-action@v1
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
+      - uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v6
         with:
           context: .
           push: 'true'
+          platforms: linux/amd64,linux/arm64
           tags: clevercloud/clever-operator:${{ github.sha }}
   docker-build-and-push-openshift-manifest:
     name: Docker build and push openshift manifest

Cargo.lock

@@ -51,7 +51,7 @@ serde_json = { version = "^1.0.138", features = [
     "float_roundtrip",
 ] }
 serde_yaml = "^0.9.33"
-tempfile = "^3.16.0"
+tempfile = "^3.17.1"
 thiserror = "^2.0.11"
 tokio = { version = "^1.43.0", features = ["full"] }
 tracing = "^0.1.41"

Cargo.toml

@@ -12,10 +12,10 @@ DOCKER_OPTS			?= --log-level debug
 DOCKER_IMG			?= clevercloud/$(NAME):$(VERSION)
 
 KUBE				?= $(shell which kubectl)
-KUBE_VERSION		?= v1.24.0
+KUBE_VERSION		?= v1.30.0
 
 OLM_SDK		    	?= $(shell which operator-sdk)
-OLM_SDK_VERSION		?= 1.26.1
+OLM_SDK_VERSION		?= 1.39.1
 OLM_VERSION			?= 0.5.5
 
 OCP_VALIDATOR		?= $(shell which ocp-olm-catalog-validator)
@@ -24,7 +24,7 @@ OCP_VERSION			?= 0.1.0
 K8S_VALIDATOR		?= $(shell which k8s-community-bundle-validator)
 K8S_VERSION			?= 0.1.0
 
-KUBE_SCORE_VERSION  ?= 1.16.1
+KUBE_SCORE_VERSION  ?= 1.19.0
 KUBE_SCORE			?= $(shell which kube-score)
 
 DEPLOY_KUBE			?= deployments/kubernetes/$(KUBE_VERSION)

Makefile

@@ -81,7 +81,7 @@ $ make deploy-kubernetes
 ```
 or
 ```
-$ kubectl apply -f deployments/kubernetes/v1.24.0
+$ kubectl apply -f deployments/kubernetes/v1.30.0
 ```
 
 #### From the helm chart
@@ -102,8 +102,8 @@ $ make deploy-kubernetes
 ```
 or
 ```
-$ kubectl apply -f https://raw.githubusercontent.com/CleverCloud/clever-operator/main/deployments/kubernetes/v1.24.0/10-custom-resource-definition.yaml
-$ kubectl apply -f https://raw.githubusercontent.com/CleverCloud/clever-operator/main/deployments/kubernetes/v1.24.0/20-deployment.yaml
+$ kubectl apply -f https://raw.githubusercontent.com/CleverCloud/clever-operator/main/deployments/kubernetes/v1.30.0/10-custom-resource-definition.yaml
+$ kubectl apply -f https://raw.githubusercontent.com/CleverCloud/clever-operator/main/deployments/kubernetes/v1.30.0/20-deployment.yaml
 ```
 
 ## Configuration
@@ -115,18 +115,14 @@ configurations could be provided through a ConfigMap, a Secret or by the environ
 
 Environment variables are:
 
-| Name                                  | Kind            | Default                        | Required | Description |
-| ------------------------------------- | --------------- | ------------------------------ | -------- | ----------- |
-| `CLEVER_OPERATOR_OPERATOR_LISTEN`     | `SocketAddress` | `0.0.0.0:7080`                 | yes      |             |
-| `CLEVER_OPERATOR_API_ENDPOINT`        | `Url`           | `https://api.clever-cloud.com` | yes      |             |
-| `CLEVER_OPERATOR_API_SECRET`          | `String`        | none                           | yes      |             |
-| `CLEVER_OPERATOR_API_TOKEN`           | `String`        | none                           | yes      |             |
-| `CLEVER_OPERATOR_API_CONSUMER_KEY`    | `String`        | none                           | yes      |             |
-| `CLEVER_OPERATOR_API_CONSUMER_SECRET` | `String`        | none                           | yes      |             |
-| `CLEVER_OPERATOR_SENTRY_DSN`          | `Url`           | none                           | no       |             |
-| `CLEVER_OPERATOR_JAEGER_ENDPOINT`     | `Url`           | none                           | no       |             |
-| `CLEVER_OPERATOR_JAEGER_USER`         | `String`        | none                           | no       |             |
-| `CLEVER_OPERATOR_JAEGER_PASSWORD`     | `String`        | none                           | no       |             |
+| Name                                  | Kind            | Default                        | Required | Description                                                       |
+| ------------------------------------- | --------------- | ------------------------------ |----------|-------------------------------------------------------------------|
+| `CLEVER_OPERATOR_OPERATOR_LISTEN`     | `SocketAddress` | `0.0.0.0:7080`                 | yes      |                                                                   |
+| `CLEVER_OPERATOR_API_ENDPOINT`        | `Url`           | `https://api.clever-cloud.com` | yes      |                                                                   |
+| `CLEVER_OPERATOR_API_SECRET`          | `String`        | none                           | false    |                                                                   |
+| `CLEVER_OPERATOR_API_TOKEN`           | `String`        | none                           | yes      | if used alone, we assume that we are using oauthless auth backend |
+| `CLEVER_OPERATOR_API_CONSUMER_KEY`    | `String`        | none                           | false    |                                                                   |
+| `CLEVER_OPERATOR_API_CONSUMER_SECRET` | `String`        | none                           | false    |                                                                   |
 
 By default, if the `--config` flag is not provided to the binary, the operator will look at the following paths to
 retrieve its configuration:
@@ -140,7 +136,7 @@ retrieve its configuration:
 ### Namespace
 
 It is possible to override configuration to connect the Clever Cloud's api through a `Secret` named `clever-operator` and using the `config` key.
-Only available configuration keys are `api` and `proxy` from the [`Configuration`](config.sample.toml).
+Only available configuration keys is `api`  from the [`Configuration`](config.sample.toml).
 
 ## License
 

README.md

@@ -1,26 +1,15 @@
 # Clever-Cloud api credentials
 #
-# Could be created using this project :
-# - https://github.com/CleverCloud/oauth-consumer-server
+# We could use only the field token in the api section in the case,
+# we are using the oauthless auth backend, like the example below.
+#
+# [api]
+# token = ""
+#
+# In the case, we are using an oauth consumer group, the configuration does not change,
+# we have three additionals fields which are secret, consumer-key and consumer-secret.
 [api]
 token = ""
 secret = ""
-consumerKey = ""
-consumerSecret = ""
-
-# Jaeger configuration
-# [jaeger]
-# endpoint = "http://localhost:14268/api/trace"
-# User and password are optional, but it is strongly recommended to use them
-# user = ""
-# password = ""
-
-# Sentry configuration
-# [sentry]
-# dsn = ""
-
-# Proxy configuration
-# [proxy]
-# http = "http://localhost:3108"
-# https = "http://localhost:3108"
-# no = ["10.0.0.1/8", "domain.example.com"]
+consumer-key = ""
+consumer-secret = ""