New version based on OCP 4.18

* List and detail base page
* OCP 4.18 compatibility
* Node 20

Author: gansheer

.gitignore

@@ -1,10 +1,43 @@
-node_modules/
+build/
 dist/
+lib/
+licenses/
+node/
+node_modules/
+site/
+spec/
+target/
+
+.env
+
+# IDEs
+.project
+.settings/
+.vscode/
+
+# Yarn v3 (non zero-installs)
+# See: https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+# Debugging output file for webpack
+__webpackConfig__.txt
+
+# snyk
+.dccache
+
+**/node_modules
+**/dist
+**/.DS_Store
 .devcontainer/dev.env
 integration-tests/videos
 integration-tests/screenshots
-integration-tests/.DS_Store
-yarn-error.log
-.DS_Store
-.vscode/
 
+tls-certificates/*.crt
+tls-certificates/*.key
+tls-certificates/*.srl

README.md

@@ -52,7 +52,7 @@ podman push quay.io/camel-tooling/camel-openshift-console-plugin:latest
 
 ```sh
 oc new-project plugin-camel-openshift-console-plugin
-helm upgrade -i camel-openshift-console-plugin charts/openshift-console-plugin --namespace plugin-camel-openshift-console-plugin --set plugin.image=quay.io/camel-tooling/camel-openshift-console-plugin:latest
+helm upgrade -i camel-openshift-console-plugin charts/camel-openshift-console-plugin --namespace plugin-camel-openshift-console-plugin --set plugin.image=quay.io/camel-tooling/camel-openshift-console-plugin:latest
 ```
 
 # The Camel Tab

bin/camel-install-openshift-console-plugin

@@ -61,4 +61,4 @@ EXISTING_PROJECT=`oc get projects | grep $NAMESPACE`
 if [ -z "$EXISTING_PROJECT" ]; then
   oc new-project $NAMESPACE
 fi
-helm upgrade -i camel-openshift-console-plugin charts/openshift-console-plugin --namespace $NAMESPACE --set plugin.image=$IMAGE
+helm upgrade -i camel-openshift-console-plugin charts/camel-openshift-console-plugin --namespace $NAMESPACE --set plugin.image=$IMAGE

charts/openshift-console-plugin/.helmignore charts/camel-openshift-console-plugin/.helmignore

@@ -0,0 +1,72 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "camel-openshift-console-plugin.name" -}}
+{{- default (default .Chart.Name .Release.Name) .Values.plugin.name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "camel-openshift-console-plugin.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "camel-openshift-console-plugin.labels" -}}
+helm.sh/chart: {{ include "camel-openshift-console-plugin.chart" . }}
+{{ include "camel-openshift-console-plugin.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "camel-openshift-console-plugin.selectorLabels" -}}
+app: {{ include "camel-openshift-console-plugin.name" . }}
+app.kubernetes.io/name: {{ include "camel-openshift-console-plugin.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/part-of: {{ include "camel-openshift-console-plugin.name" . }}
+{{- end }}
+
+{{/*
+Create the name secret containing the certificate
+*/}}
+{{- define "camel-openshift-console-plugin.certificateSecret" -}}
+{{ default (printf "%s-cert" (include "camel-openshift-console-plugin.name" .)) .Values.plugin.certificateSecretName }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "camel-openshift-console-plugin.serviceAccountName" -}}
+{{- if .Values.plugin.serviceAccount.create }}
+{{- default (include "camel-openshift-console-plugin.name" .) .Values.plugin.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.plugin.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create the name of the patcher
+*/}}
+{{- define "camel-openshift-console-plugin.patcherName" -}}
+{{- printf "%s-patcher" (include "camel-openshift-console-plugin.name" .) }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "camel-openshift-console-plugin.patcherServiceAccountName" -}}
+{{- if .Values.plugin.patcherServiceAccount.create }}
+{{- default (printf "%s-patcher" (include "camel-openshift-console-plugin.name" .)) .Values.plugin.patcherServiceAccount.name }}
+{{- else }}
+{{- default "default" .Values.plugin.patcherServiceAccount.name }}
+{{- end }}
+{{- end }}

charts/openshift-console-plugin/Chart.yaml charts/camel-openshift-console-plugin/Chart.yaml

@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "openshift-console-plugin.name" . }}
+  name: {{ template "camel-openshift-console-plugin.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "openshift-console-plugin.labels" . | nindent 4 }}
+    {{- include "camel-openshift-console-plugin.labels" . | nindent 4 }}
 data:
   nginx.conf: |
     error_log /dev/stdout info;

charts/camel-openshift-console-plugin/templates/_helpers.tpl

@@ -0,0 +1,18 @@
+apiVersion: console.openshift.io/v1
+kind: ConsolePlugin
+metadata:
+  name: {{ template "camel-openshift-console-plugin.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "camel-openshift-console-plugin.labels" . | nindent 4 }}
+spec:
+  displayName: {{ default (printf "%s Plugin" (include "camel-openshift-console-plugin.name" .)) .Values.plugin.description }}
+  i18n: 
+    loadType: Preload
+  backend:
+    type: Service
+    service:
+      name: {{ template "camel-openshift-console-plugin.name" . }}
+      namespace: {{ .Release.Namespace }}
+      port: {{ .Values.plugin.port }}
+      basePath: {{ .Values.plugin.basePath }}

charts/openshift-console-plugin/templates/plugin-configmap.yaml charts/camel-openshift-console-plugin/templates/configmap.yaml

@@ -1,23 +1,23 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ template "openshift-console-plugin.name" . }}
+  name: {{ template "camel-openshift-console-plugin.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "openshift-console-plugin.labels" . | nindent 4 }}
+    {{- include "camel-openshift-console-plugin.labels" . | nindent 4 }}
     app.openshift.io/runtime-namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.plugin.replicas }}
   selector:
     matchLabels:
-      {{- include "openshift-console-plugin.selectorLabels" . | nindent 6 }}
+      {{- include "camel-openshift-console-plugin.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-            {{- include "openshift-console-plugin.labels" . | nindent 8 }}
+            {{- include "camel-openshift-console-plugin.labels" . | nindent 8 }}
     spec:
       containers:
-        - name: {{ template "openshift-console-plugin.name" . }}
+        - name: {{ template "camel-openshift-console-plugin.name" . }}
           image: {{ required "Plugin image must be specified!" .Values.plugin.image }}
           ports:
             - containerPort: {{ .Values.plugin.port }}
@@ -29,21 +29,21 @@ spec:
           resources:
             {{- toYaml .Values.plugin.resources | nindent 12 }}
           volumeMounts:
-            - name: {{ template "openshift-console-plugin.certificateSecret" . }}
+            - name: {{ template "camel-openshift-console-plugin.certificateSecret" . }}
               readOnly: true
               mountPath: /var/cert
             - name: nginx-conf
               readOnly: true
               mountPath: /etc/nginx/nginx.conf
               subPath: nginx.conf
       volumes:
-        - name: {{ template "openshift-console-plugin.certificateSecret" . }}
+        - name: {{ template "camel-openshift-console-plugin.certificateSecret" . }}
           secret:
-            secretName: {{ template "openshift-console-plugin.certificateSecret" . }}
+            secretName: {{ template "camel-openshift-console-plugin.certificateSecret" . }}
             defaultMode: 420
         - name: nginx-conf
           configMap:
-            name: {{ template "openshift-console-plugin.name" . }}
+            name: {{ template "camel-openshift-console-plugin.name" . }}
             defaultMode: 420
       restartPolicy: Always
       dnsPolicy: ClusterFirst

charts/camel-openshift-console-plugin/templates/consoleplugin.yaml

@@ -2,10 +2,10 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ template "openshift-console-plugin.patcherName" . }}
+  name: {{ template "camel-openshift-console-plugin.patcherName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "openshift-console-plugin.labels" . | nindent 4 }}
+    {{- include "camel-openshift-console-plugin.labels" . | nindent 4 }}
   annotations:
     helm.sh/hook: post-install,post-upgrade
     helm.sh/hook-delete-policy: before-hook-creation
@@ -14,17 +14,17 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "openshift-console-plugin.labels" . | nindent 8 }}
+        {{- include "camel-openshift-console-plugin.labels" . | nindent 8 }}
     spec:
       restartPolicy: OnFailure
-      serviceAccountName: {{ template "openshift-console-plugin.patcherServiceAccountName" . }}
+      serviceAccountName: {{ template "camel-openshift-console-plugin.patcherServiceAccountName" . }}
       {{- if  and (.Values.plugin.securityContext.enabled) (.Values.plugin.jobs.patchConsoles.podSecurityContext.enabled) }}
       securityContext: {{ tpl (toYaml (omit .Values.plugin.jobs.patchConsoles.podSecurityContext "enabled")) $ | nindent 8 }}
       {{- end }}
       terminationGracePeriodSeconds: 400
       dnsPolicy: ClusterFirst
       containers:
-        - name: {{ template "openshift-console-plugin.patcherName" . }}
+        - name: {{ template "camel-openshift-console-plugin.patcherName" . }}
           image: {{ required "Patcher image must be specified!" .Values.plugin.jobs.patchConsoles.image }}
           {{- if and (.Values.plugin.securityContext.enabled) (.Values.plugin.containerSecurityContext) }}
           securityContext: {{ tpl (toYaml (omit .Values.plugin.jobs.patchConsoles.containerSecurityContext "enabled")) $ | nindent 12 }}
@@ -36,7 +36,7 @@ spec:
             - -c
             - |
                 existingPlugins=$(oc get consoles.operator.openshift.io cluster -o json | jq -c '.spec.plugins // []')
-                mergedPlugins=$(jq --argjson existingPlugins "${existingPlugins}" --argjson consolePlugin '["{{ template "openshift-console-plugin.name" . }}"]' -c  -n '$existingPlugins + $consolePlugin | unique')
+                mergedPlugins=$(jq --argjson existingPlugins "${existingPlugins}" --argjson consolePlugin '["{{ template "camel-openshift-console-plugin.name" . }}"]' -c  -n '$existingPlugins + $consolePlugin | unique')
                 patchedPlugins=$(jq --argjson mergedPlugins $mergedPlugins -n -c  '{ "spec": { "plugins": $mergedPlugins } }')
                 oc patch consoles.operator.openshift.io cluster --patch $patchedPlugins  --type=merge
 {{- end }}

charts/openshift-console-plugin/templates/plugin-deployment.yaml charts/camel-openshift-console-plugin/templates/deployment.yaml

@@ -2,10 +2,10 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "openshift-console-plugin.patcherName" . }}
+  name: {{ template "camel-openshift-console-plugin.patcherName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "openshift-console-plugin.labels" . | nindent 4 }}
+    {{- include "camel-openshift-console-plugin.labels" . | nindent 4 }}
 rules:
   - apiGroups: ["operator.openshift.io"]
     resources: ["consoles"]

charts/openshift-console-plugin/templates/patch-consoles-job.yaml charts/camel-openshift-console-plugin/templates/patch-consoles-job.yaml

@@ -2,16 +2,16 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ template "openshift-console-plugin.patcherName" . }}
+  name: {{ template "camel-openshift-console-plugin.patcherName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "openshift-console-plugin.labels" . | nindent 4 }}
+    {{- include "camel-openshift-console-plugin.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "openshift-console-plugin.patcherName" . }}
+  name: {{ template "camel-openshift-console-plugin.patcherName" . }}
 subjects:
   - kind: ServiceAccount
-    name: {{ template "openshift-console-plugin.patcherServiceAccountName" . }}
+    name: {{ template "camel-openshift-console-plugin.patcherServiceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 {{- end }}

charts/openshift-console-plugin/templates/patcher-clusterrole.yaml charts/camel-openshift-console-plugin/templates/patcher-clusterrole.yaml

@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "openshift-console-plugin.patcherServiceAccountName" . }}
+  name: {{ include "camel-openshift-console-plugin.patcherServiceAccountName" . }}
   labels:
-    {{- include "openshift-console-plugin.labels" . | nindent 4 }}
+    {{- include "camel-openshift-console-plugin.labels" . | nindent 4 }}
   {{- with .Values.plugin.patcherServiceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

charts/openshift-console-plugin/templates/patcher-clusterrolebinding.yaml charts/camel-openshift-console-plugin/templates/patcher-clusterrolebinding.yaml

@@ -3,19 +3,19 @@ kind: Service
 metadata:
   {{- if not .Values.certificateSecretName }}
   annotations:
-    service.alpha.openshift.io/serving-cert-secret-name: {{ template "openshift-console-plugin.certificateSecret" . }}
+    service.alpha.openshift.io/serving-cert-secret-name: {{ template "camel-openshift-console-plugin.certificateSecret" . }}
   {{- end }}
-  name: {{ template "openshift-console-plugin.name" . }}
+  name: {{ template "camel-openshift-console-plugin.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "openshift-console-plugin.labels" . | nindent 4 }}
+    {{- include "camel-openshift-console-plugin.labels" . | nindent 4 }}
 spec:
   ports:
     - name: {{ .Values.plugin.port }}-tcp
       protocol: TCP
       port: {{ .Values.plugin.port }}
       targetPort: {{ .Values.plugin.port }}
   selector:
-    {{- include "openshift-console-plugin.selectorLabels" . | nindent 4 }}
+    {{- include "camel-openshift-console-plugin.selectorLabels" . | nindent 4 }}
   type: ClusterIP
   sessionAffinity: None

charts/openshift-console-plugin/templates/patcher-serviceaccount.yaml charts/camel-openshift-console-plugin/templates/patcher-serviceaccount.yaml

@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "openshift-console-plugin.serviceAccountName" . }}
+  name: {{ include "camel-openshift-console-plugin.serviceAccountName" . }}
   labels:
-    {{- include "openshift-console-plugin.labels" . | nindent 4 }}
+    {{- include "camel-openshift-console-plugin.labels" . | nindent 4 }}
   {{- with .Values.plugin.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

charts/openshift-console-plugin/templates/plugin-service.yaml charts/camel-openshift-console-plugin/templates/service.yaml

@@ -2,8 +2,8 @@
 plugin:
   name: ""
   description: ""
-  image: "quay.io/camel-tooling/camel-openshift-console-plugin:latest"
-  imagePullPolicy: Always
+  image: ""
+  imagePullPolicy: IfNotPresent
   replicas: 1
   port: 9443
   securityContext: