Skip to content

Commit 36eb4bb

Browse files
authored
fixing susanoo references with netapp-openshift-console-trident
1 parent 6a035ea commit 36eb4bb

17 files changed

+96
-344
lines changed

BUILD.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Log in as user:
2929
Use the 'oc' command line interface:
3030
$ eval $(crc oc-env)
3131
$ oc login -u developer https://api.crc.testing:6443
32-
romv@romv-mac-0 susanoo-openshift %
32+
romv@romv-mac-0 netapp-openshift-console-trident %
3333
```
3434

3535
- ensure the following dependencies are met:
@@ -40,15 +40,15 @@ romv@romv-mac-0 susanoo-openshift %
4040

4141
- clone this repository
4242
```
43-
git clone https://github.com/NetApp/susanoo-openshift.git
43+
git clone https://github.com/NetApp/netapp-openshift-console-trident.git
4444
```
4545
- install all the code dependencies:
4646
```
4747
yarn install
4848
```
4949
expected output:
5050
```
51-
romv@romv-mac-0 susanoo-openshift % yarn install
51+
romv@romv-mac-0 netapp-openshift-console-trident % yarn install
5252
yarn install v1.22.22
5353
[1/4] 🔍 Resolving packages...
5454
[2/4] 🚚 Fetching packages...
@@ -70,7 +70,7 @@ yarn run start
7070
```
7171
expected output:
7272
```
73-
romv@romv-mac-0 susanoo-openshift % yarn start
73+
romv@romv-mac-0 netapp-openshift-console-trident % yarn start
7474
yarn run v1.22.22
7575
$ yarn webpack serve --progress
7676
$ node -r ts-node/register ./node_modules/.bin/webpack serve --progress
@@ -111,7 +111,7 @@ oc login <cluster_url>
111111
```
112112
expected output:
113113
```
114-
romv@romv-mac-0 susanoo-openshift % oc login -u kubeadmin
114+
romv@romv-mac-0 netapp-openshift-console-trident % oc login -u kubeadmin
115115
Logged into "https://api.crc.testing:6443" as "kubeadmin" using existing credentials.
116116
117117
You have access to 65 projects, the list has been suppressed. You can list all projects with 'oc projects'

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Change Log
22

33
All notable changes to this project will be documented in the
4-
[Releases](https://github.com/NetApp/susanoo/releases) page on GitHub.
4+
[Releases](https://github.com/NetApp/netapp-openshift-console-trident/releases) page on GitHub.

DOCS.md

Lines changed: 8 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,8 @@
11
# netapp-openshift-console-trident
22

3-
This project is currently in a pre-release phase and requires an early access legal agreement to deploy and use netapp-openshift-console-trident.
4-
5-
## netapp-openshift-console-trident container image access
6-
The container image is available via our GitHub organization's container registry as a private package with the access token as an image pull secret.
7-
8-
### Create a Kubernetes Secret for ```docker-registry```
9-
10-
The required details to create the secret are:
11-
- a GitHub username
12-
- a generated GitHub Token
13-
14-
Then:
15-
* First, create the ```namespace``` or ```project``` for netapp-openshift-console-trident:
16-
```
17-
oc new-project netapp-openshift-console-trident
18-
```
19-
20-
* Then, run the following command with the provided details:
21-
```
22-
oc -n netapp-openshift-console-trident create secret docker-registry ghcr-netapp-openshift-console-trident-secret --docker-server=https://ghcr.io --docker-username=$YOUR_GITHUB_USERNAME --docker-password=$YOUR_GITHUB_TOKEN
23-
```
24-
25-
> [!NOTE]
26-
> The secret name is ```ghcr-netapp-openshift-console-trident-secret``` and will be used by the Helm Charts. Changing the name might fail the deployment.
27-
28-
The secret could also be created using a YAML manfiest. Here is the process:
29-
30-
* Encode your GitHub username with the access token:
31-
```
32-
echo -n "myusername:mysecretoken" | base64
33-
```
34-
Expected output:
35-
```
36-
bXl1c2VybmFtZTpteXNlY3JldG9rZW4=
37-
```
38-
39-
* Create a ```netapp-openshift-console-trident.json``` file for future reference with the following details:
40-
```
41-
{"auths":{"ghcr.io":{"auth": "bXl1c2VybmFtZTpteXNlY3JldG9rZW4"}}}
42-
```
43-
* Encode the content:
44-
```
45-
echo -n "{"auths":{"ghcr.io":{"auth": "bXl1c2VybmFtZTpteXNlY3JldG9rZW4"}}}" | base64
46-
```
47-
expected output:
48-
```
49-
e2F1dGhzOntnaGNyLmlvOnthdXRoOiBiWGwxYzJWeWJtRnRaVHB0ZVhObFkzSmxkRzlyWlc0fX19
50-
```
51-
* Then create a secret YAML manifest ```ghcr-netapp-openshift-console-trident-secret.yaml```:
52-
```YAML
53-
apiVersion: v1
54-
kind: Secret
55-
metadata:
56-
name: ghcr-netapp-openshift-console-trident-secret
57-
namespace: netapp-openshift-console-trident
58-
data:
59-
.dockerconfigjson: e2F1dGhzOntnaGNyLmlvOnthdXRoOiBiWGwxYzJWeWJtRnRaVHB0ZVhObFkzSmxkRzlyWlc0fX19
60-
type: kubernetes.io/dockerconfigjson
61-
```
62-
* Finally, push the manifest to Kubernetes:
63-
```
64-
oc create -f ghcr-netapp-openshift-console-trident-secret.yaml
65-
```
66-
67-
> [!NOTE]
68-
> While the access Token is **read only**, it is a good practice to ***not be saved*** these files in a Git repository as it contains credentials.
3+
This project is currently in a pre-release phase and requires an Early Access Program agreement granting a read-only access token to deploy the netapp-openshift-console-trident plugin on your Red Hat OpenShift cluster.
694

5+
Reach out to the NetApp Innovation Labs team to know more.
706

717
## Deployment with Helm
728

@@ -79,19 +15,23 @@ The provided Helm Charts allows you to deploy easily netapp-openshift-console-tr
7915

8016
* Then, when in the ```netapp-openshift-console-trident``` folder, run:
8117
```
82-
helm install netapp-openshift-console-trident charts/netapp-openshift-console-trident -n netapp-openshift-console-trident --create-namespace --set plugin.image=ghcr.io/netapp/netapp-openshift-console-trident:25.6.25
18+
helm install netapp-openshift-console-trident . -n netapp-openshift-console-trident --create-namespace --set plugin.image=ghcr.io/netapp/netapp-openshift-console-trident:25.6.25 --set plugin.imageCredentials.registry=ghcr.io --set plugin.imageCredentials.username=<username> --set plugin.imageCredentials.token=<token>
8319
```
8420
Expected output:
8521
```
8622
Release "netapp-openshift-console-trident" does not exist. Installing it now.
8723
NAME: netapp-openshift-console-trident
88-
LAST DEPLOYED: Tue Mar 18 20:07:27 2025
24+
LAST DEPLOYED: Wed Jun 11 11:38:31 2025
8925
NAMESPACE: netapp-openshift-console-trident
9026
STATUS: deployed
9127
REVISION: 1
9228
TEST SUITE: None
9329
```
9430

31+
> [!NOTE]
32+
> While the access Token is **read only**, it is a good practice to ***not be saved*** these files in a Git repository as it contains credentials.
33+
```
34+
9535
The only variable is ```plugin.image=ghcr.io/netapp/netapp-openshift-console-trident:25.6.25``` corresponding to the desired version to deploy. At the current stage, the following version(s) are available:
9636
- 25.6.25
9737

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ netapp-openshift-console-trident deploys as a native Red Hat OpenShift console p
1212
## Pre-requisites and Deployment
1313

1414
This project is currently in a pre-release phase and requires an Early Access Program agreement granting access token to deploy the plugin on your Red Hat OpenShift cluster.
15-
The netapp-openshift-console-protect plugin is compatible with Red Hat OpenShift Container Platform 4.14, 4.15, 4.16, and 4.17.
15+
The netapp-openshift-console-trident plugin is compatible with Red Hat OpenShift Container Platform **4.14, 4.15, 4.16, and 4.17**.
1616

1717
Documentation is available [here](DOCS.md).
1818

charts/netapp-openshift-console-trident/templates/_helpers.tpl

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{{/*
22
Expand the name of the chart.
33
*/}}
4-
{{- define "susanoo.name" -}}
4+
{{- define "netapp-openshift-console-trident.name" -}}
55
{{- default (default .Chart.Name .Release.Name) .Values.plugin.name | trunc 63 | trimSuffix "-" }}
66
{{- end }}
77

88

99
{{/*
1010
Create chart name and version as used by the chart label.
1111
*/}}
12-
{{- define "susanoo.chart" -}}
12+
{{- define "netapp-openshift-console-trident.chart" -}}
1313
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
1414
{{- end }}
1515

1616
{{/*
1717
Common labels
1818
*/}}
19-
{{- define "susanoo.labels" -}}
20-
helm.sh/chart: {{ include "susanoo.chart" . }}
21-
{{ include "susanoo.selectorLabels" . }}
19+
{{- define "netapp-openshift-console-trident.labels" -}}
20+
helm.sh/chart: {{ include "netapp-openshift-console-trident.chart" . }}
21+
{{ include "netapp-openshift-console-trident.selectorLabels" . }}
2222
{{- if .Chart.AppVersion }}
2323
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
2424
{{- end }}
@@ -28,26 +28,26 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
2828
{{/*
2929
Selector labels
3030
*/}}
31-
{{- define "susanoo.selectorLabels" -}}
32-
app: {{ include "susanoo.name" . }}
33-
app.kubernetes.io/name: {{ include "susanoo.name" . }}
31+
{{- define "netapp-openshift-console-trident.selectorLabels" -}}
32+
app: {{ include "netapp-openshift-console-trident.name" . }}
33+
app.kubernetes.io/name: {{ include "netapp-openshift-console-trident.name" . }}
3434
app.kubernetes.io/instance: {{ .Release.Name }}
35-
app.kubernetes.io/part-of: {{ include "susanoo.name" . }}
35+
app.kubernetes.io/part-of: {{ include "netapp-openshift-console-trident.name" . }}
3636
{{- end }}
3737

3838
{{/*
3939
Create the name secret containing the certificate
4040
*/}}
41-
{{- define "susanoo.certificateSecret" -}}
42-
{{ default (printf "%s-cert" (include "susanoo.name" .)) .Values.plugin.certificateSecretName }}
41+
{{- define "netapp-openshift-console-trident.certificateSecret" -}}
42+
{{ default (printf "%s-cert" (include "netapp-openshift-console-trident.name" .)) .Values.plugin.certificateSecretName }}
4343
{{- end }}
4444

4545
{{/*
4646
Create the name of the service account to use
4747
*/}}
48-
{{- define "susanoo.serviceAccountName" -}}
48+
{{- define "netapp-openshift-console-trident.serviceAccountName" -}}
4949
{{- if .Values.plugin.serviceAccount.create }}
50-
{{- default (include "susanoo.name" .) .Values.plugin.serviceAccount.name }}
50+
{{- default (include "netapp-openshift-console-trident.name" .) .Values.plugin.serviceAccount.name }}
5151
{{- else }}
5252
{{- default "default" .Values.plugin.serviceAccount.name }}
5353
{{- end }}
@@ -56,16 +56,16 @@ Create the name of the service account to use
5656
{{/*
5757
Create the name of the patcher
5858
*/}}
59-
{{- define "susanoo.patcherName" -}}
60-
{{- printf "%s-patcher" (include "susanoo.name" .) }}
59+
{{- define "netapp-openshift-console-trident.patcherName" -}}
60+
{{- printf "%s-patcher" (include "netapp-openshift-console-trident.name" .) }}
6161
{{- end }}
6262

6363
{{/*
6464
Create the name of the service account to use
6565
*/}}
66-
{{- define "susanoo.patcherServiceAccountName" -}}
66+
{{- define "netapp-openshift-console-trident.patcherServiceAccountName" -}}
6767
{{- if .Values.plugin.patcherServiceAccount.create }}
68-
{{- default (printf "%s-patcher" (include "susanoo.name" .)) .Values.plugin.patcherServiceAccount.name }}
68+
{{- default (printf "%s-patcher" (include "netapp-openshift-console-trident.name" .)) .Values.plugin.patcherServiceAccount.name }}
6969
{{- else }}
7070
{{- default "default" .Values.plugin.patcherServiceAccount.name }}
7171
{{- end }}

charts/netapp-openshift-console-trident/templates/configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: {{ .Values.plugin.name }}-configmap
55
namespace: {{ .Release.Namespace }}
66
labels:
7-
{{- include "susanoo.labels" . | nindent 4 }}
7+
{{- include "netapp-openshift-console-trident.labels" . | nindent 4 }}
88
data:
99
nginx.conf: |
1010
error_log /dev/stdout info;

charts/netapp-openshift-console-trident/templates/consoleplugin.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ metadata:
66
labels:
77
{{- include "susanoo.labels" . | nindent 4 }}
88
spec:
9-
displayName: 'Susanoo by NetApp'
9+
displayName: 'netapp-openshift-console-trident'
1010
backend:
1111
type: Service
1212
service:
13-
name: {{ template "susanoo.name" . }}
13+
name: {{ template "netapp-openshift-console-trident.name" . }}
1414
namespace: {{ .Release.Namespace }}
1515
port: 9443
1616
basePath: '/'

charts/netapp-openshift-console-trident/templates/deployment.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@ metadata:
44
name: {{ .Values.plugin.name }}-deployment
55
namespace: {{ .Release.Namespace }}
66
labels:
7-
{{- include "susanoo.labels" . | nindent 4 }}
7+
{{- include "netapp-openshift-console-trident.labels" . | nindent 4 }}
88
app.openshift.io/runtime-namespace: {{ .Release.Namespace }}
99
spec:
1010
replicas: {{ .Values.plugin.replicas }}
1111
selector:
1212
matchLabels:
13-
{{- include "susanoo.selectorLabels" . | nindent 6 }}
13+
{{- include "netapp-openshift-console-trident.selectorLabels" . | nindent 6 }}
1414
template:
1515
metadata:
1616
labels:
17-
{{- include "susanoo.labels" . | nindent 8 }}
17+
{{- include "netapp-openshift-console-trident.labels" . | nindent 8 }}
1818
spec:
1919
imagePullSecrets:
2020
- name: {{ .Values.plugin.name }}-registry-secret
2121
containers:
22-
- name: {{ template "susanoo.name" . }}
22+
- name: {{ template "netapp-openshift-console-trident.name" . }}
2323
image: {{ required "Plugin image must be specified!" .Values.plugin.image }}
2424
ports:
2525
- containerPort: {{ .Values.plugin.port }}
@@ -34,7 +34,7 @@ spec:
3434
- name: console-serving-cert
3535
readOnly: true
3636
mountPath: /var/serving-cert
37-
- name: susanoo-nginx-config
37+
- name: netapp-openshift-console-trident-nginx-config
3838
readOnly: true
3939
mountPath: /etc/nginx/nginx.conf
4040
subPath: nginx.conf
@@ -43,7 +43,7 @@ spec:
4343
secret:
4444
secretName: console-serving-cert
4545
defaultMode: 420
46-
- name: susanoo-nginx-config
46+
- name: netapp-openshift-console-trident-nginx-config
4747
configMap:
4848
name: {{ .Values.plugin.name }}-configmap
4949
defaultMode: 420

0 commit comments

Comments
 (0)