maintenance

romdalf · romdalf · commit 1bf5de77aaf8 · 2025-07-09T12:22:41.000+02:00
diff --git a/charts/netapp-openshift-console-trident/Chart.yaml b/charts/netapp-openshift-console-trident/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: netapp-openshift-console-trident
-description: "NetApp OpenShift Console Plugin provides a single pane integration with NetApp Intelligent Data Management solutions for containers and virtual machines"
+description: "NetApp Console Plugin for Red Hat OpenShift provides a single pane integration with NetApp Intelligent Data Management solutions for containers and virtual machines"
 type: application
-version: 25.6.10
+version: 25.7.1
 appVersion: 25.6.25
diff --git a/charts/netapp-openshift-console-trident/templates/configmap.yaml b/charts/netapp-openshift-console-trident/templates/configmap.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Values.plugin.name }}-configmap
-  namespace: {{ .Release.Namespace }}
+  name: {{ .Values.plugin.name }}
+  namespace: {{ .Values.plugin.namespace }}
   labels:
     {{- include "netapp-openshift-console-trident.labels" . | nindent 4 }}
 data:
diff --git a/charts/netapp-openshift-console-trident/templates/consoleplugin.yaml b/charts/netapp-openshift-console-trident/templates/consoleplugin.yaml
@@ -2,15 +2,15 @@ apiVersion: console.openshift.io/v1
 kind: ConsolePlugin
 metadata:
   name: {{ .Values.plugin.name }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.plugin.namespace }}
   labels:
-    {{- include "susanoo.labels" . | nindent 4 }}
+    {{- include "netapp-openshift-console-trident.labels" . | nindent 4 }}
 spec:
   displayName: 'netapp-openshift-console-trident'
   backend:
     type: Service
     service:
       name: {{ template "netapp-openshift-console-trident.name" . }}
-      namespace: {{ .Release.Namespace }}
+      namespace: {{ .Values.plugin.namespace }}
       port: 9443
       basePath: '/'
diff --git a/charts/netapp-openshift-console-trident/templates/deployment.yaml b/charts/netapp-openshift-console-trident/templates/deployment.yaml
@@ -2,10 +2,10 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Values.plugin.name }}-deployment
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.plugin.namespace }}
   labels:
     {{- include "netapp-openshift-console-trident.labels" . | nindent 4 }}
-    app.openshift.io/runtime-namespace: {{ .Release.Namespace }}
+    app.openshift.io/runtime-namespace: {{ .Values.plugin.namespace }}
 spec:
   replicas: {{ .Values.plugin.replicas }}
   selector:
@@ -20,11 +20,11 @@ spec:
         - name: {{ .Values.plugin.name }}-registry-secret
       containers:
         - name: {{ template "netapp-openshift-console-trident.name" . }}
-          image: {{ required "Plugin image must be specified!" .Values.plugin.image }}
+          image: {{ .Values.plugin.image.repository }}:{{ .Values.plugin.image.tag }}
           ports:
             - containerPort: {{ .Values.plugin.port }}
               protocol: TCP
-          imagePullPolicy: {{ .Values.plugin.imagePullPolicy }}
+          imagePullPolicy: {{ .Values.plugin.image.pullPolicy }}
           {{- if and (.Values.plugin.securityContext.enabled) (.Values.plugin.containerSecurityContext) }}
           securityContext: {{ tpl (toYaml (omit .Values.plugin.containerSecurityContext "enabled")) $ | nindent 12 }}
           {{- end }}
@@ -45,7 +45,7 @@ spec:
             defaultMode: 420
         - name: netapp-openshift-console-trident-nginx-config
           configMap:
-            name: {{ .Values.plugin.name }}-configmap
+            name: {{ .Values.plugin.name }}
             defaultMode: 420
       restartPolicy: Always
       dnsPolicy: ClusterFirst
diff --git a/charts/netapp-openshift-console-trident/templates/patch-consoles-job.yaml b/charts/netapp-openshift-console-trident/templates/patch-consoles-job.yaml
@@ -3,7 +3,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ template "netapp-openshift-console-trident.patcherName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.plugin.namespace }}
   labels:
     {{- include "netapp-openshift-console-trident.labels" . | nindent 4 }}
   annotations:
diff --git a/charts/netapp-openshift-console-trident/templates/patcher-clusterrole.yaml b/charts/netapp-openshift-console-trident/templates/patcher-clusterrole.yaml
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: {{ template "netapp-openshift-console-trident.patcherName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.plugin.namespace }}
   labels:
     {{- include "netapp-openshift-console-trident.labels" . | nindent 4 }}
 rules:
diff --git a/charts/netapp-openshift-console-trident/templates/patcher-clusterrolebinding.yaml b/charts/netapp-openshift-console-trident/templates/patcher-clusterrolebinding.yaml
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ template "netapp-openshift-console-trident.patcherName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.plugin.namespace }}
   labels:
     {{- include "netapp-openshift-console-trident.labels" . | nindent 4 }}
 roleRef:
@@ -13,5 +13,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "netapp-openshift-console-trident.patcherServiceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ .Values.plugin.namespace }}
 {{- end }}
diff --git a/charts/netapp-openshift-console-trident/templates/patcher-serviceaccount.yaml b/charts/netapp-openshift-console-trident/templates/patcher-serviceaccount.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "netapp-openshift-console-trident.patcherServiceAccountName" . }}-sa
+  name: {{ include "netapp-openshift-console-trident.patcherServiceAccountName" . }}
   labels:
     {{- include "netapp-openshift-console-trident.labels" . | nindent 4 }}
   {{- with .Values.plugin.patcherServiceAccount.annotations }}
diff --git a/charts/netapp-openshift-console-trident/templates/secret.yaml b/charts/netapp-openshift-console-trident/templates/secret.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Values.plugin.name }}-registry-secret
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.plugin.namespace }}
 type: kubernetes.io/dockerconfigjson
 data:
   .dockerconfigjson: {{ template "imagePullSecret" . }}
diff --git a/charts/netapp-openshift-console-trident/templates/service.yaml b/charts/netapp-openshift-console-trident/templates/service.yaml
@@ -3,8 +3,8 @@ kind: Service
 metadata:
   annotations:
     service.alpha.openshift.io/serving-cert-secret-name: console-serving-cert
-  name: {{ .Values.plugin.name }}-service
-  namespace: {{ .Release.Namespace }}
+  name: {{ .Values.plugin.name }}
+  namespace: {{ .Values.plugin.namespace }}
   labels:
     {{- include "netapp-openshift-console-trident.labels" . | nindent 4 }}
 spec:
diff --git a/charts/netapp-openshift-console-trident/values.yaml b/charts/netapp-openshift-console-trident/values.yaml
@@ -1,9 +1,12 @@
 ---
 plugin:
   name: "netapp-openshift-console-trident"
-  description: "NetApp OpenShift Console Plugin provides a single pane integration with NetApp Intelligent Data Management solutions for containers and virtual machines"
-  image: ""
-  imagePullPolicy: Always
+  namespace: "netapp-openshift-console-trident"
+  description: "NetApp Console Plug-in for Red Hat OpenShift provides a single pane integration with NetApp Intelligent Data Management solutions for containers and virtual machines"
+  image:
+    repository: ghcr.io/netapp/netapp-openshift-console-trident
+    tag: 25.6.25
+    pullPolicy: Always 
   imageCredentials:
     registry: ghcr.io
     username: ""
diff --git a/console-extensions.json b/console-extensions.json
@@ -13,18 +13,18 @@
   {
     "type": "console.flag/model",
     "properties": {
-      "flag": "NETAPP_IOS",
+      "flag": "NETAPP_CONSOLE_TRIDENT",
       "model": {
         "group": "netapp.com",
         "version": "v1",
-        "kind": "Susanoo"
+        "kind": "netapp-openshift-console-trident"
       }
     }
   },
   {
     "type": "console.navigation/section",
     "properties": {
-      "id": "admin-susanoo-section",
+      "id": "admin-trident-section",
       "perspective": "admin",
       "name": "NetApp Storage Console",
       "insertBefore": "builds"
@@ -43,11 +43,11 @@
   {
     "type": "console.navigation/href",
     "properties": {
-      "id": "admin-susanoo-storage",
+      "id": "admin-trident-storage",
       "name": "Storage",
       "href": "/susanoo-storage",
       "perspective": "admin",
-      "section": "admin-susanoo-section"
+      "section": "admin-trident-section"
     }
   },  
   {
@@ -63,11 +63,11 @@
   {
     "type": "console.navigation/href",
     "properties": {
-      "id": "admin-susanoo-backend",
+      "id": "admin-trident-backend",
       "name": "Setup",
       "href": "/susanoo-backend",
       "perspective": "admin",
-      "section": "admin-susanoo-section"
+      "section": "admin-trident-section"
     }
   },      
   {
diff --git a/src/components/SusanooPluginAbout.tsx b/src/components/SusanooPluginAbout.tsx
@@ -10,29 +10,21 @@ const SusanooPluginAbout = () => {
     return (
       <>
         <TextContent>
-          <p>The open-source project <strong>Susanoo</strong> for Red Hat OpenShift has been designed to improve the user experience connecting with the NetApp portfolio.</p>
+          <p>The open-source project <strong>netapp-openshift-console-trident</strong> for Red Hat OpenShift has been designed to improve the user experience connecting with the NetApp portfolio.</p>
           <p>The project is provided <strong>AS-IS</strong> under the <a href="https://github.com/NetApp/susanoo-openshift?tab=Apache-2.0-1-ov-file#readme" target="_blank">Apache License 2.0</a> with community support only. If you have any questions, open a GitHub Issue using the link below.</p>
         </TextContent>
         <TextContent>
         <TextList component='dl'>
           <TextListItem component='dt'>Version</TextListItem>
-          <TextListItem component='dd'>25.4.25</TextListItem>
+          <TextListItem component='dd'>25.6.25</TextListItem>
           <TextListItem component='dt'>Docs & Help</TextListItem>
           <TextListItem component='dd'>            <a 
-              href="https://github.com/NetApp/susanoo" 
+              href="https://github.com/NetApp/netapp-openshift-console-trident" 
               target="_blank" 
               rel="noopener noreferrer"
             >
               NetApp/susanoo
-            </a></TextListItem>
-          <TextListItem component='dt'>Patterns</TextListItem>
-          <TextListItem component='dd'>            <a 
-              href="https://github.com/NetApp/susanoo-patterns" 
-              target="_blank" 
-              rel="noopener noreferrer"
-            >
-              NetApp/susanoo-patterns
-            </a></TextListItem>
+            </a></TextListItem>=
         </TextList>
         </TextContent>
       </>
diff --git a/src/components/backend/SusanooBackendSetup.tsx b/src/components/backend/SusanooBackendSetup.tsx
@@ -157,7 +157,7 @@ const SusanooConsolePlugin = () => {
 
   return (
     <>
-      <ListPageHeader title="Susanoo">
+      <ListPageHeader title="NetApp OpenShift Console for Trident">
         <Button 
           variant='primary'
           onClick={handleModalToggle}
@@ -171,7 +171,7 @@ const SusanooConsolePlugin = () => {
           brandImageSrc={NetAppLogo}
           backgroundImageSrc='/assets/netapp-logo.svg'
           trademark='NETAPP, the NETAPP logo, and the marks listed on the NetApp Trademarks page are trademarks of NetApp, Inc. Other company and product names may be trademarks of their respective owners.'
-          aria-label='About Susanoo Plugin'
+          aria-label='About NetApp Trident OpenShift Console Plug-in'
         >
           <SusanooPluginAbout />
         </AboutModal>
@@ -181,7 +181,7 @@ const SusanooConsolePlugin = () => {
           <CardTitle>Plugins</CardTitle>
           <CardBody>
             <SusanooTable 
-              data={data.filter(item => item.metadata.name === 'susanoo')}
+              data={data.filter(item => item.metadata.name === 'netapp-openshift-console-trident')}
               unfilteredData={data}
               loaded={loaded}
               error={error}
