Merge pull request #146 from leanix/feature/HEL-1267-cronjob-name

HEL-1267 Fixed kubernetes cronjob name composition
leanix · Jan 10, 2022 · 44d33b9 · 44d33b9
2 parents 635f8ad + b3eb116
commit 44d33b9
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # LeanIX Kubernetes Connector Changelog
 
+## Release 2022-01-10 - 6.3.1
+* All k8s workloads are now prefixed with the Helm release name instead of being suffixed to avoid length issues with kubernetes.
+
 ## Release 2022-01-03 - 6.3.0
 * Connector Logs can be accessed in iHub (w.r.t specific dataSource name) `Show Log` button for troubleshooting and monitoring purpose.
 

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 PROJECT ?= leanix-k8s-connector
 DOCKER_NAMESPACE ?= leanixacrpublic.azurecr.io
 
-VERSION := 6.3.0
+VERSION := 6.3.1
 FULL_VERSION := $(VERSION)-$(shell git describe --tags --always)
 
 IMAGE := $(DOCKER_NAMESPACE)/$(PROJECT):$(VERSION)

diff --git a/README.md b/README.md
@@ -578,6 +578,7 @@ e.g `--set args.storageBackend=file`
 
 | Release date | Connector version | Integration version | Helm chart version | Container image tag |
 | :----------: | :---------------: | :-----------------: | :----------------: | :-----------------: |
+|  2022-01-10  |       6.3.1       |        1.0.0        |       6.3.1        |        6.3.1        |
 |  2022-01-03  |       6.3.0       |        1.0.0        |       6.3.0        |        6.3.0        |
 |  2022-01-03  |       6.2.0       |        1.0.0        |       6.2.0        |        6.2.0        |
 |  2021-12-08  |       6.1.0       |        1.0.0        |       6.1.0        |        6.1.0        |

diff --git a/helm/index.yaml b/helm/index.yaml
@@ -1,9 +1,19 @@
 apiVersion: v1
 entries:
   leanix-k8s-connector:
+  - apiVersion: v1
+    appVersion: 6.3.1
+    created: "2022-01-10T15:03:43.584728+01:00"
+    description: Retrieves information from Kubernetes cluster
+    digest: 90645625e19f21d7812275b7319516fcfeb031cd4ef848dfba4032e65d67cdc4
+    kubeVersion: '>= 1.19.0-0'
+    name: leanix-k8s-connector
+    urls:
+    - leanix-k8s-connector-6.3.1.tgz
+    version: 6.3.1
   - apiVersion: v1
     appVersion: 6.3.0
-    created: "2022-01-03T13:13:26.726066+01:00"
+    created: "2022-01-10T15:03:43.583863+01:00"
     description: Retrieves information from Kubernetes cluster
     digest: 44973672d6054cd0660a94e71b23bf9cf472f27bc532133981af6f6055e87424
     kubeVersion: '>= 1.19.0-0'
@@ -13,7 +23,7 @@ entries:
     version: 6.3.0
   - apiVersion: v1
     appVersion: 6.2.0
-    created: "2022-01-03T13:13:26.723288+01:00"
+    created: "2022-01-10T15:03:43.583139+01:00"
     description: Retrieves information from Kubernetes cluster
     digest: 5774478e89bc749ba21ec7f2477bb348788f2bbf6e8b76956eee5c4739de9e46
     kubeVersion: '>= 1.19.0-0'
@@ -23,7 +33,7 @@ entries:
     version: 6.2.0
   - apiVersion: v1
     appVersion: 6.1.0
-    created: "2022-01-03T13:13:26.721701+01:00"
+    created: "2022-01-10T15:03:43.582171+01:00"
     description: Retrieves information from Kubernetes cluster
     digest: eabf3e49a9d4a0722228cb24872e6dfcc7b9db6b764bc714a74c0941f0d3ea4f
     name: leanix-k8s-connector
@@ -32,7 +42,7 @@ entries:
     version: 6.1.0
   - apiVersion: v1
     appVersion: 6.0.3
-    created: "2022-01-03T13:13:26.720341+01:00"
+    created: "2022-01-10T15:03:43.580899+01:00"
     description: Retrieves information from Kubernetes cluster
     digest: 5f1be6a80fc173d45ca60f5da8937abc0fcb2cc14652d6149d9ff2e405568a71
     name: leanix-k8s-connector
@@ -41,7 +51,7 @@ entries:
     version: 6.0.3
   - apiVersion: v1
     appVersion: 6.0.2
-    created: "2022-01-03T13:13:26.718644+01:00"
+    created: "2022-01-10T15:03:43.579686+01:00"
     description: Retrieves information from Kubernetes cluster
     digest: ccd112d1de601bfa796c4413ddc2b394f93ec4b66604338a736593168523b327
     name: leanix-k8s-connector
@@ -50,7 +60,7 @@ entries:
     version: 6.0.2
   - apiVersion: v1
     appVersion: 6.0.1
-    created: "2022-01-03T13:13:26.716584+01:00"
+    created: "2022-01-10T15:03:43.578749+01:00"
     description: Retrieves information from Kubernetes cluster
     digest: f3b959e24bdbf55314fa6d0a05681ec41dd34b1493b026a3450bf147e62a4b1b
     name: leanix-k8s-connector
@@ -59,7 +69,7 @@ entries:
     version: 6.0.1
   - apiVersion: v1
     appVersion: 6.0.0
-    created: "2022-01-03T13:13:26.715001+01:00"
+    created: "2022-01-10T15:03:43.57633+01:00"
     description: Retrieves information from Kubernetes cluster
     digest: c51f68b592c6f608a2f982e8c322280b8fc3aa4ac6ed0d823b2baf24b0877e6b
     name: leanix-k8s-connector
@@ -68,7 +78,7 @@ entries:
     version: 6.0.0
   - apiVersion: v1
     appVersion: 5.0.0
-    created: "2022-01-03T13:13:26.712156+01:00"
+    created: "2022-01-10T15:03:43.5741+01:00"
     description: Retrieves information from Kubernetes cluster
     digest: 549a753cf9875ca4eeaf5ecb5c64e76149b30bb8e82eee821f6c81cca27c37cf
     name: leanix-k8s-connector
@@ -77,7 +87,7 @@ entries:
     version: 5.0.0
   - apiVersion: v1
     appVersion: 4.0.0
-    created: "2022-01-03T13:13:26.710963+01:00"
+    created: "2022-01-10T15:03:43.572958+01:00"
     description: Retrieves information from Kubernetes cluster
     digest: adf5c8ef024857c4a0845a5c659f27bd7f21cdf568fff3445a192425c44fc9a8
     name: leanix-k8s-connector
@@ -86,7 +96,7 @@ entries:
     version: 4.0.0
   - apiVersion: v1
     appVersion: 3.0.0
-    created: "2022-01-03T13:13:26.710195+01:00"
+    created: "2022-01-10T15:03:43.571569+01:00"
     description: Retrieves information from Kubernetes cluster
     digest: 2927aebc215a1c5175e986135e36a10101e90fa69e7ab22a183049d086f7eddb
     name: leanix-k8s-connector
@@ -95,7 +105,7 @@ entries:
     version: 3.0.0
   - apiVersion: v1
     appVersion: 2.0.0
-    created: "2022-01-03T13:13:26.709008+01:00"
+    created: "2022-01-10T15:03:43.569055+01:00"
     description: Retrieves information from Kubernetes cluster
     digest: 3481723d2374757038495117518c47f634054408ccbd55112a6260d5a15e18c9
     name: leanix-k8s-connector
@@ -104,7 +114,7 @@ entries:
     version: 2.0.0
   - apiVersion: v1
     appVersion: 2.0.0-beta7
-    created: "2022-01-03T13:13:26.707932+01:00"
+    created: "2022-01-10T15:03:43.567677+01:00"
     description: Retrieves information from Kubernetes cluster
     digest: 0ade89d01236286f11ebf70290e2c4c82740fac11ec755be9dddd2375c74246f
     name: leanix-k8s-connector
@@ -113,11 +123,11 @@ entries:
     version: 2.0.0-beta7
   - apiVersion: v1
     appVersion: 1.1.0
-    created: "2022-01-03T13:13:26.706693+01:00"
+    created: "2022-01-10T15:03:43.565979+01:00"
     description: Retrieves information from Kubernetes cluster
     digest: aa3ee10eefe30e61e37058762b031bdee11cb9dd67afecdf6e831335d5c16e0f
     name: leanix-k8s-connector
     urls:
     - leanix-k8s-connector-1.0.0.tgz
     version: 1.0.0
-generated: "2022-01-03T13:13:26.705274+01:00"
+generated: "2022-01-10T15:03:43.561139+01:00"
diff --git a/helm/leanix-k8s-connector/Chart.yaml b/helm/leanix-k8s-connector/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
-appVersion: "6.3.0"
+appVersion: "6.3.1"
 description: Retrieves information from Kubernetes cluster
 name: leanix-k8s-connector
-version: 6.3.0
+version: 6.3.1
 kubeVersion: '>= 1.19.0-0'
diff --git a/helm/leanix-k8s-connector/templates/_helpers.tpl b/helm/leanix-k8s-connector/templates/_helpers.tpl
@@ -3,23 +3,23 @@
 Expand the name of the chart.
 */}}
 {{- define "leanix-k8s-connector.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 52 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+We truncate at 52 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "leanix-k8s-connector.fullname" -}}
 {{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- .Values.fullnameOverride | trunc 52 | trimSuffix "-" -}}
 {{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- .Release.Name | trunc 52 | trimSuffix "-" -}}
 {{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 52 | trimSuffix "-" -}}
 {{- end -}}
 {{- end -}}
 {{- end -}}
@@ -28,7 +28,7 @@ If release name contains chart name it will be used as a full name.
 Create chart name and version as used by the chart label.
 */}}
 {{- define "leanix-k8s-connector.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 52 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*

diff --git a/helm/leanix-k8s-connector/templates/cronjob.yaml b/helm/leanix-k8s-connector/templates/cronjob.yaml
@@ -1,7 +1,7 @@
 apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
-  name: {{ include "leanix-k8s-connector.fullname" . }}-{{ .Release.Name }}
+  name: {{ include "leanix-k8s-connector.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
 {{ include "leanix-k8s-connector.labels" . | indent 4 }}