Skip to content

Commit 88c5353

Browse files
trusted workload cleanup
Signed-off-by: Jena, Satyabrata <satyabrata.jena@intel.com>
1 parent 4f0b0f0 commit 88c5353

6 files changed

Lines changed: 14 additions & 21 deletions

File tree

helm/trusted-workload/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.0
1+
1.3.0-dev

helm/trusted-workload/charts/cc-operator/templates/cc-operator-deployment.yaml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
# Copyright (C) 2025 Intel Corporation
22
# SPDX-License-Identifier: BSD-3-Clause
33
---
4-
apiVersion: v1
5-
kind: Namespace
6-
metadata:
7-
labels:
8-
control-plane: controller-manager
9-
name: confidential-containers-system
10-
---
114
apiVersion: apiextensions.k8s.io/v1
125
kind: CustomResourceDefinition
136
metadata:
@@ -6412,13 +6405,13 @@ apiVersion: v1
64126405
kind: ServiceAccount
64136406
metadata:
64146407
name: cc-operator-controller-manager
6415-
namespace: confidential-containers-system
6408+
namespace: {{ .Release.Namespace }}
64166409
---
64176410
apiVersion: rbac.authorization.k8s.io/v1
64186411
kind: Role
64196412
metadata:
64206413
name: cc-operator-leader-election-role
6421-
namespace: confidential-containers-system
6414+
namespace: {{ .Release.Namespace }}
64226415
rules:
64236416
- apiGroups:
64246417
- ""
@@ -6557,15 +6550,15 @@ apiVersion: rbac.authorization.k8s.io/v1
65576550
kind: RoleBinding
65586551
metadata:
65596552
name: cc-operator-leader-election-rolebinding
6560-
namespace: confidential-containers-system
6553+
namespace: {{ .Release.Namespace }}
65616554
roleRef:
65626555
apiGroup: rbac.authorization.k8s.io
65636556
kind: Role
65646557
name: cc-operator-leader-election-role
65656558
subjects:
65666559
- kind: ServiceAccount
65676560
name: cc-operator-controller-manager
6568-
namespace: confidential-containers-system
6561+
namespace: {{ .Release.Namespace }}
65696562
---
65706563
apiVersion: rbac.authorization.k8s.io/v1
65716564
kind: ClusterRoleBinding
@@ -6578,7 +6571,7 @@ roleRef:
65786571
subjects:
65796572
- kind: ServiceAccount
65806573
name: cc-operator-controller-manager
6581-
namespace: confidential-containers-system
6574+
namespace: {{ .Release.Namespace }}
65826575
---
65836576
apiVersion: rbac.authorization.k8s.io/v1
65846577
kind: ClusterRoleBinding
@@ -6591,7 +6584,7 @@ roleRef:
65916584
subjects:
65926585
- kind: ServiceAccount
65936586
name: cc-operator-controller-manager
6594-
namespace: confidential-containers-system
6587+
namespace: {{ .Release.Namespace }}
65956588
---
65966589
apiVersion: v1
65976590
data:
@@ -6610,15 +6603,15 @@ data:
66106603
kind: ConfigMap
66116604
metadata:
66126605
name: cc-operator-manager-config
6613-
namespace: confidential-containers-system
6606+
namespace: {{ .Release.Namespace }}
66146607
---
66156608
apiVersion: v1
66166609
kind: Service
66176610
metadata:
66186611
labels:
66196612
control-plane: controller-manager
66206613
name: cc-operator-controller-manager-metrics-service
6621-
namespace: confidential-containers-system
6614+
namespace: {{ .Release.Namespace }}
66226615
spec:
66236616
ports:
66246617
- name: https
@@ -6634,7 +6627,7 @@ metadata:
66346627
labels:
66356628
control-plane: controller-manager
66366629
name: cc-operator-controller-manager
6637-
namespace: confidential-containers-system
6630+
namespace: {{ .Release.Namespace }}
66386631
spec:
66396632
replicas: 1
66406633
selector:

helm/trusted-workload/charts/cc-runtimeclass/templates/cc-runtimeclass-cleanup.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: batch/v1
55
kind: Job
66
metadata:
77
name: ccruntime-cleanup
8-
namespace: confidential-containers-system
8+
namespace: {{ .Release.Namespace }}
99
annotations:
1010
helm.sh/hook: pre-delete
1111
helm.sh/hook-weight: "-5"

helm/trusted-workload/charts/cc-runtimeclass/templates/cc-runtimeclass-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: batch/v1
55
kind: Job
66
metadata:
77
name: ccruntime-installer
8-
namespace: confidential-containers-system
8+
namespace: {{ .Release.Namespace }}
99
spec:
1010
template:
1111
spec:

helm/trusted-workload/templates/cc-sequence-job-rbac.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ metadata:
1717
subjects:
1818
- kind: ServiceAccount
1919
name: cc-operator-controller-manager
20-
namespace: confidential-containers-system
20+
namespace: {{ .Release.Namespace }}
2121
roleRef:
2222
kind: ClusterRole
2323
name: helm-cluster-role

helm/trusted-workload/tests/cc-sequence-job-rbac_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ tests:
3838
content:
3939
kind: ServiceAccount
4040
name: cc-operator-controller-manager
41-
namespace: confidential-containers-system
41+
namespace: {{ .Release.Namespace }}
4242
- equal:
4343
path: roleRef.kind
4444
value: ClusterRole

0 commit comments

Comments
 (0)