From 290875f390d7dd20e8757789803d8f296e4268f1 Mon Sep 17 00:00:00 2001 From: Leonid Podolinskiy Date: Wed, 1 May 2024 12:06:26 +0300 Subject: [PATCH] update kube-rbac-proxy to latest (#21) * update kube-rbac-proxy to latest * add list of available images to docs --- docs/README.md | 7 ++++++- examples/lightrunjavaagent.yaml | 24 ++++++++++++------------ helm-chart/templates/deployment.yaml | 2 +- helm-chart/values.yaml | 10 +++++----- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/docs/README.md b/docs/README.md index 414c777..8e859c1 100644 --- a/docs/README.md +++ b/docs/README.md @@ -122,7 +122,12 @@ For the sake of simplicity, we are keeping the convention of the same version fo #### Supported Platforms - Linux - Alpine -- K8s type of deployment + > Available init containers: + > - [Java agent for linux x86_64](https://hub.docker.com/r/lightruncom/k8s-operator-init-java-agent-linux/tags) + > - [Java agent for linux arm64 ](https://hub.docker.com/r/lightruncom/k8s-operator-init-java-agent-linux-arm64) + > - [Java agent for alpine x86_64](https://hub.docker.com/r/lightruncom/k8s-operator-init-java-agent-alpine/tags) + > - [Java agent for alpine arm64 ](https://hub.docker.com/r/lightruncom/k8s-operator-init-java-agent-alpine-arm64) +- K8s type of resources - Deployment - Application's language - Java diff --git a/examples/lightrunjavaagent.yaml b/examples/lightrunjavaagent.yaml index 243d85c..75927f9 100644 --- a/examples/lightrunjavaagent.yaml +++ b/examples/lightrunjavaagent.yaml @@ -1,35 +1,35 @@ apiVersion: agents.lightrun.com/v1beta kind: LightrunJavaAgent metadata: - name: example-cr + name: example-cr spec: ############################################################################################### # Fields that you need to change if you want to try operator with your own deployment ############################################################################################### # Name of the deployment that you are going to patch. # Has to be in the same namespace - deploymentName: sample-deployment + deploymentName: sample-deployment # List of container names inside the pod of the deployment # If container not mentioned here it will be not patched containerSelector: - - app + - app # Agent config will override default configuration with provided values # You can find list of available options here https://docs.lightrun.com/jvm/agent-configuration/ agentEnvVarName: JAVA_TOOL_OPTIONS # Name of the secret where agent will take `lightrun_key` and `pinned_cert_hash` from # Has to be in the same namespace - secretName: lightrun-secrets - + secretName: lightrun-secrets ############################################################################################### # Fields that are mostly fine with default values for most deployments ############################################################################################### - # Init container with agent. Differes by agent version and platform that it will be used for. For now supported platforms are `linux` and `alpine` - initContainer: - # parts that may vary here are + # Init container with agent. Differes by agent version and platform that it will be used for. For now supported platforms are `linux` and `alpine` + initContainer: + # parts that may vary here are # platform - `linux/alpine` # agent version - first part of the tag (1.7.0) # init container sub-version - last part of the tag (init.0) + # List of available images in the README.md image: "lightruncom/k8s-operator-init-java-agent-linux:latest" # Volume name in case you have some convention in the names sharedVolumeName: lightrun-agent-init @@ -38,7 +38,7 @@ spec: sharedVolumeMountPath: "/lightrun" # Hostname of the server. Will be different for on-prem ans single-tenant installations # For saas it is app.lightrun.com - serverHostname: app.lightrun.com + serverHostname: app.lightrun.com # Env var that will be patched with agent path. # If your application not using any, recommended option is to use "JAVA_TOOL_OPTIONS" # Also may be "_JAVA_OPTIONS", "JAVA_OPTS" @@ -47,7 +47,7 @@ spec: agentConfig: max_log_cpu_cost: "2" # agentCliFlags is used if need to pass additional flags to the agent, - # that are not part of configuration file. + # that are not part of configuration file. # https://docs.lightrun.com/jvm/agent-configuration/#additional-command-line-flags # Example below # agentCliFlags: --lightrun_extra_class_path=:,lightrun_init_wait_time_ms @@ -62,7 +62,7 @@ spec: --- apiVersion: v1 -metadata: +metadata: name: lightrun-secrets stringData: # Lightrun key you can take from the server UI at the "setup agent" step @@ -70,4 +70,4 @@ stringData: # Server certificate hash. It is ensuring that agent is connected to the right Lightrun server pinned_cert_hash: kind: Secret -type: Opaque \ No newline at end of file +type: Opaque diff --git a/helm-chart/templates/deployment.yaml b/helm-chart/templates/deployment.yaml index 419055e..18eea8f 100644 --- a/helm-chart/templates/deployment.yaml +++ b/helm-chart/templates/deployment.yaml @@ -32,7 +32,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=0 - image: {{ .Values.controllerManager.kubeRbacProxy.image.repository }}:{{ .Values.controllerManager.kubeRbacProxy.image.tag | default .Chart.AppVersion }} + image: {{ .Values.controllerManager.kubeRbacProxy.image.repository }}:{{ .Values.controllerManager.kubeRbacProxy.image.tag }} name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index 2f3582e..395ca8c 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -7,7 +7,7 @@ controllerManager: kubeRbacProxy: image: repository: gcr.io/kubebuilder/kube-rbac-proxy - tag: v0.11.0 + tag: v0.15.0 resources: limits: cpu: 500m @@ -46,10 +46,10 @@ controllerManager: # purpose: stage ## If you want to set node selector for operator deployment, delete the `{}` in the line above ## and uncomment this example block - # label-key1: "label-value1" - # label-key2: "label-value2" + # label-key1: "label-value1" + # label-key2: "label-value2" -## Controller configuration +## Controller configuration managerConfig: # -- Log level: 1 - 5 # Higher number - more logs @@ -89,5 +89,5 @@ metricsService: targetPort: 8443 type: ClusterIP -## Comment out if you want to use Release name as prefix to the resource naming +## Comment out if you want to use Release name as prefix to the resource naming nameOverride: lightrun-k8s-operator