feat: rename naas-portal to paas-portal across all resources
All checks were successful
AI Review / AI Code Review (pull_request) Successful in 2s
PR Checks / Validate & Security Scan (pull_request) Successful in 13s

- Helm chart: charts/naas-portal → charts/paas-portal
- ArgoCD app: naas-portal → paas-portal
- Environment values: naas-portal → paas-portal
- ClusterRole: naas-manager → paas-manager (operational-rbac)
- Tenant labels: naas.georgepet.duckdns.org → paas.georgepet.duckdns.org
- Secret: naas-portal-secrets → paas-portal-secrets
- Image: claude/naas-portal → claude/paas-portal
This commit is contained in:
claude 2026-02-24 18:24:21 +01:00
parent 046bdac3f0
commit ddc3def7c4
17 changed files with 57 additions and 85 deletions

View File

@ -1,22 +1,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: naas-manager
namespace: kube-system
---
apiVersion: v1
kind: Secret
metadata:
name: naas-manager-token
namespace: kube-system
annotations:
kubernetes.io/service-account.name: naas-manager
type: kubernetes.io/service-account-token
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: naas-manager
name: paas-manager
rules:
# Read namespaces (check tenant exists, list tenants)
- apiGroups: [""]
@ -58,16 +43,3 @@ rules:
- apiGroups: [""]
resources: ["pods/log"]
verbs: ["get"]
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: naas-manager
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: naas-manager
subjects:
- kind: ServiceAccount
name: naas-manager
namespace: kube-system

View File

@ -1,10 +1,10 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: naas-portal
name: paas-portal
namespace: argocd
labels:
app.kubernetes.io/part-of: naas
app.kubernetes.io/part-of: paas
finalizers:
- resources-finalizer.argocd.argoproj.io
spec:
@ -12,10 +12,10 @@ spec:
source:
repoURL: http://10.10.10.1:3000/claude/k8s-apps.git
targetRevision: main
path: charts/naas-portal
path: charts/paas-portal
helm:
valueFiles:
- ../../environments/prod/naas-portal.yaml
- ../../environments/prod/paas-portal.yaml
destination:
server: https://kubernetes.default.svc
namespace: prod

View File

@ -4,7 +4,7 @@ metadata:
finalizers:
- resources-finalizer.argocd.argoproj.io
labels:
naas: 'true'
paas: 'true'
tenant: t1
name: tenant-t1
namespace: argocd

View File

@ -1,12 +0,0 @@
{{- define "naas-portal.fullname" -}}
naas-portal
{{- end -}}
{{- define "naas-portal.labels" -}}
app.kubernetes.io/name: naas-portal
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}
{{- define "naas-portal.selectorLabels" -}}
app: naas-portal
{{- end -}}

View File

@ -1,6 +0,0 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "naas-portal.fullname" . }}
labels:
{{- include "naas-portal.labels" . | nindent 4 }}

View File

@ -1,5 +1,5 @@
apiVersion: v2
name: naas-portal
name: paas-portal
description: PaaS Portal — self-service Kubernetes platform
version: 1.0.0
appVersion: "1.0"

View File

@ -0,0 +1,12 @@
{{- define "paas-portal.fullname" -}}
paas-portal
{{- end -}}
{{- define "paas-portal.labels" -}}
app.kubernetes.io/name: paas-portal
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}
{{- define "paas-portal.selectorLabels" -}}
app: paas-portal
{{- end -}}

View File

@ -1,14 +1,14 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: naas-portal
name: paas-portal
labels:
{{- include "naas-portal.labels" . | nindent 4 }}
{{- include "paas-portal.labels" . | nindent 4 }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: naas-manager
name: paas-manager
subjects:
- kind: ServiceAccount
name: {{ include "naas-portal.fullname" . }}
name: {{ include "paas-portal.fullname" . }}
namespace: {{ .Release.Namespace }}

View File

@ -1,24 +1,24 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "naas-portal.fullname" . }}
name: {{ include "paas-portal.fullname" . }}
labels:
{{- include "naas-portal.labels" . | nindent 4 }}
{{- include "paas-portal.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
{{- include "naas-portal.selectorLabels" . | nindent 6 }}
{{- include "paas-portal.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
{{- include "naas-portal.selectorLabels" . | nindent 8 }}
{{- include "paas-portal.selectorLabels" . | nindent 8 }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "naas-portal.fullname" . }}
serviceAccountName: {{ include "paas-portal.fullname" . }}
automountServiceAccountToken: true
securityContext:
runAsNonRoot: true
@ -27,7 +27,7 @@ spec:
seccompProfile:
type: RuntimeDefault
containers:
- name: naas-portal
- name: paas-portal
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
@ -90,6 +90,6 @@ spec:
volumes:
- name: data
persistentVolumeClaim:
claimName: {{ include "naas-portal.fullname" . }}-data
claimName: {{ include "paas-portal.fullname" . }}-data
- name: tmp
emptyDir: {}

View File

@ -1,9 +1,9 @@
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ include "naas-portal.fullname" . }}
name: {{ include "paas-portal.fullname" . }}
labels:
{{- include "naas-portal.labels" . | nindent 4 }}
{{- include "paas-portal.labels" . | nindent 4 }}
annotations:
cert-manager.io/cluster-issuer: {{ .Values.ingress.clusterIssuer }}
spec:
@ -11,7 +11,7 @@ spec:
tls:
- hosts:
- {{ .Values.ingress.host }}
secretName: {{ include "naas-portal.fullname" . }}-tls
secretName: {{ include "paas-portal.fullname" . }}-tls
rules:
- host: {{ .Values.ingress.host }}
http:
@ -20,6 +20,6 @@ spec:
pathType: Prefix
backend:
service:
name: {{ include "naas-portal.fullname" . }}
name: {{ include "paas-portal.fullname" . }}
port:
number: 80

View File

@ -1,13 +1,13 @@
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: {{ include "naas-portal.fullname" . }}
name: {{ include "paas-portal.fullname" . }}
labels:
{{- include "naas-portal.labels" . | nindent 4 }}
{{- include "paas-portal.labels" . | nindent 4 }}
spec:
podSelector:
matchLabels:
{{- include "naas-portal.selectorLabels" . | nindent 6 }}
{{- include "paas-portal.selectorLabels" . | nindent 6 }}
policyTypes:
- Ingress
- Egress

View File

@ -1,9 +1,9 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: {{ include "naas-portal.fullname" . }}-data
name: {{ include "paas-portal.fullname" . }}-data
labels:
{{- include "naas-portal.labels" . | nindent 4 }}
{{- include "paas-portal.labels" . | nindent 4 }}
spec:
accessModes:
- ReadWriteOnce

View File

@ -1,13 +1,13 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "naas-portal.fullname" . }}
name: {{ include "paas-portal.fullname" . }}
labels:
{{- include "naas-portal.labels" . | nindent 4 }}
{{- include "paas-portal.labels" . | nindent 4 }}
spec:
type: ClusterIP
selector:
{{- include "naas-portal.selectorLabels" . | nindent 4 }}
{{- include "paas-portal.selectorLabels" . | nindent 4 }}
ports:
- port: 80
targetPort: http

View File

@ -0,0 +1,6 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "paas-portal.fullname" . }}
labels:
{{- include "paas-portal.labels" . | nindent 4 }}

View File

@ -1,6 +1,6 @@
image:
registry: "10.10.10.1:3000"
repository: "claude/naas-portal"
repository: "claude/paas-portal"
tag: "v1.0"
pullPolicy: IfNotPresent
@ -23,7 +23,7 @@ persistence:
size: 500Mi
storageClass: longhorn
secretName: "naas-portal-secrets"
secretName: "paas-portal-secrets"
env:
GITEA_URL: "http://10.10.10.1:3000"
@ -32,7 +32,7 @@ env:
KEYCLOAK_CLIENT_ID: "naas-portal"
K8S_API_EXTERNAL: "https://185.47.204.231:6443"
PORTAL_URL: "https://georgepaas.duckdns.org"
DB_PATH: "/app/data/naas.db"
DB_PATH: "/app/data/paas.db"
imagePullSecrets:
- name: gitea-registry

View File

@ -11,8 +11,8 @@ tenant-{{ .Values.tenant.id }}-sa
{{- end }}
{{- define "tenant.labels" -}}
app.kubernetes.io/managed-by: naas
naas.georgepet.duckdns.org/tenant: "true"
naas.georgepet.duckdns.org/id: {{ .Values.tenant.id | quote }}
naas.georgepet.duckdns.org/tier: {{ .Values.tenant.tier | quote }}
app.kubernetes.io/managed-by: paas
paas.georgepet.duckdns.org/tenant: "true"
paas.georgepet.duckdns.org/id: {{ .Values.tenant.id | quote }}
paas.georgepet.duckdns.org/tier: {{ .Values.tenant.tier | quote }}
{{- end }}

View File

@ -1,6 +1,6 @@
image:
registry: "10.10.10.1:3000"
repository: "claude/naas-portal"
repository: "claude/paas-portal"
tag: "v1.0"
ingress:
@ -13,4 +13,4 @@ env:
KEYCLOAK_CLIENT_ID: "naas-portal"
K8S_API_EXTERNAL: "https://185.47.204.231:6443"
PORTAL_URL: "https://georgepaas.duckdns.org"
DB_PATH: "/app/data/naas.db"
DB_PATH: "/app/data/paas.db"