Skip to content

Commit

Permalink
Merge pull request confidential-containers#29 from lmilleri/rename-op…
Browse files Browse the repository at this point in the history
…erator

Code changes for renaming into trustee-operator
  • Loading branch information
bpradipt authored May 31, 2024
2 parents c79fd8c + c201a07 commit 55ccf3a
Show file tree
Hide file tree
Showing 18 changed files with 47 additions and 47 deletions.
6 changes: 3 additions & 3 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ layout:
plugins:
manifests.sdk.operatorframework.io/v2: {}
scorecard.sdk.operatorframework.io/v2: {}
projectName: kbs-operator
repo: github.com/confidential-containers/kbs-operator
projectName: trustee-operator
repo: github.com/confidential-containers/trustee-operator
resources:
- api:
crdVersion: v1
namespaced: true
controller: true
domain: confidentialcontainers.org
kind: KbsConfig
path: github.com/confidential-containers/kbs-operator/api/v1alpha1
path: github.com/confidential-containers/trustee-operator/api/v1alpha1
version: v1alpha1
version: "3"
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# kbs-operator
# trustee-operator

The `kbs-operator` manages the lifecycle of [trustee](https://github.com/confidential-containers/trustee) along with it's configuration when deployed
The `trustee-operator` manages the lifecycle of [trustee](https://github.com/confidential-containers/trustee) along with it's configuration when deployed
in a Kubernetes cluster

## Description
Expand Down
2 changes: 1 addition & 1 deletion bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM scratch
LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=kbs-operator
LABEL operators.operatorframework.io.bundle.package.v1=trustee-operator
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.33.0
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ metadata:
creationTimestamp: null
labels:
app.kubernetes.io/component: kube-rbac-proxy
app.kubernetes.io/created-by: kbs-operator
app.kubernetes.io/created-by: trustee-operator
app.kubernetes.io/instance: controller-manager-metrics-service
app.kubernetes.io/managed-by: kustomize
app.kubernetes.io/name: service
app.kubernetes.io/part-of: kbs-operator
app.kubernetes.io/part-of: trustee-operator
control-plane: controller-manager
name: kbs-operator-controller-manager-metrics-service
name: trustee-operator-controller-manager-metrics-service
spec:
ports:
- name: https
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ metadata:
creationTimestamp: null
labels:
app.kubernetes.io/component: kube-rbac-proxy
app.kubernetes.io/created-by: kbs-operator
app.kubernetes.io/created-by: trustee-operator
app.kubernetes.io/instance: metrics-reader
app.kubernetes.io/managed-by: kustomize
app.kubernetes.io/name: clusterrole
app.kubernetes.io/part-of: kbs-operator
name: kbs-operator-metrics-reader
app.kubernetes.io/part-of: trustee-operator
name: trustee-operator-metrics-reader
rules:
- nonResourceURLs:
- /metrics
Expand Down
22 changes: 11 additions & 11 deletions bundle/manifests/kbs-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ metadata:
"kind": "KbsConfig",
"metadata": {
"labels": {
"app.kubernetes.io/created-by": "kbs-operator",
"app.kubernetes.io/created-by": "trustee-operator",
"app.kubernetes.io/instance": "kbsconfig-sample",
"app.kubernetes.io/managed-by": "kustomize",
"app.kubernetes.io/name": "kbsconfig",
"app.kubernetes.io/part-of": "kbs-operator"
"app.kubernetes.io/part-of": "trustee-operator"
},
"name": "kbsconfig-sample-sample",
"namespace": "kbs-operator-system"
Expand All @@ -33,7 +33,7 @@ metadata:
createdAt: "2024-04-29T09:43:48Z"
operators.operatorframework.io/builder: operator-sdk-v1.33.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
name: kbs-operator.v0.0.1
name: trustee-operator.v0.0.1
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand All @@ -44,8 +44,8 @@ spec:
kind: KbsConfig
name: kbsconfigs.confidentialcontainers.org
version: v1alpha1
description: Operator to manage the lifecycle of Key Broker Service (KBS)
displayName: KBS Operator
description: Operator to manage the lifecycle of Trustee
displayName: Trustee Operator
icon:
- base64data: PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTguNTEgMjU4LjUxIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2QxZDFkMTt9LmNscy0ye2ZpbGw6IzhkOGQ4Zjt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkFzc2V0IDQ8L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMTI5LjI1LDIwQTEwOS4xLDEwOS4xLDAsMCwxLDIwNi40LDIwNi40LDEwOS4xLDEwOS4xLDAsMSwxLDUyLjExLDUyLjExLDEwOC40NSwxMDguNDUsMCwwLDEsMTI5LjI1LDIwbTAtMjBoMEM1OC4xNiwwLDAsNTguMTYsMCwxMjkuMjVIMGMwLDcxLjA5LDU4LjE2LDEyOS4yNiwxMjkuMjUsMTI5LjI2aDBjNzEuMDksMCwxMjkuMjYtNTguMTcsMTI5LjI2LTEyOS4yNmgwQzI1OC41MSw1OC4xNiwyMDAuMzQsMCwxMjkuMjUsMFoiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNzcuNTQsMTAzLjQxSDE0MS42NkwxNTQuOSw2NS43NmMxLjI1LTQuNC0yLjMzLTguNzYtNy4yMS04Ljc2SDEwMi45M2E3LjMyLDcuMzIsMCwwLDAtNy40LDZsLTEwLDY5LjYxYy0uNTksNC4xNywyLjg5LDcuODksNy40LDcuODloMzYuOUwxMTUuNTUsMTk3Yy0xLjEyLDQuNDEsMi40OCw4LjU1LDcuMjQsOC41NWE3LjU4LDcuNTgsMCwwLDAsNi40Ny0zLjQ4TDE4NCwxMTMuODVDMTg2Ljg2LDEwOS4yNCwxODMuMjksMTAzLjQxLDE3Ny41NCwxMDMuNDFaIi8+PC9nPjwvZz48L3N2Zz4=
mediatype: image/svg+xml
Expand Down Expand Up @@ -142,11 +142,11 @@ spec:
deployments:
- label:
app.kubernetes.io/component: manager
app.kubernetes.io/created-by: kbs-operator
app.kubernetes.io/created-by: trustee-operator
app.kubernetes.io/instance: controller-manager
app.kubernetes.io/managed-by: kustomize
app.kubernetes.io/name: deployment
app.kubernetes.io/part-of: kbs-operator
app.kubernetes.io/part-of: trustee-operator
control-plane: controller-manager
name: kbs-operator-controller-manager
spec:
Expand Down Expand Up @@ -294,13 +294,13 @@ spec:
- supported: true
type: AllNamespaces
keywords:
- kbs
- kbs-operator
- trustee
- trustee-operator
- attestation-service
- rvps
links:
- name: Kbs Operator
url: https://github.com/confidential-containers/kbs-operator
- name: Trustee Operator
url: https://github.com/confidential-containers/trustee-operator
maintainers:
- email: [email protected]
name: Pradipta Banerjee
Expand Down
2 changes: 1 addition & 1 deletion bundle/metadata/annotations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ annotations:
operators.operatorframework.io.bundle.mediatype.v1: registry+v1
operators.operatorframework.io.bundle.manifests.v1: manifests/
operators.operatorframework.io.bundle.metadata.v1: metadata/
operators.operatorframework.io.bundle.package.v1: kbs-operator
operators.operatorframework.io.bundle.package.v1: trustee-operator
operators.operatorframework.io.bundle.channels.v1: alpha
operators.operatorframework.io.metrics.builder: operator-sdk-v1.33.0
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
Expand Down
4 changes: 2 additions & 2 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log/zap"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

confidentialcontainersorgv1alpha1 "github.com/confidential-containers/kbs-operator/api/v1alpha1"
controller "github.com/confidential-containers/kbs-operator/internal/controller"
confidentialcontainersorgv1alpha1 "github.com/confidential-containers/trustee-operator/api/v1alpha1"
controller "github.com/confidential-containers/trustee-operator/internal/controller"
"sigs.k8s.io/controller-runtime/pkg/manager"
//+kubebuilder:scaffold:imports
)
Expand Down
8 changes: 4 additions & 4 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
app.kubernetes.io/name: namespace
app.kubernetes.io/instance: system
app.kubernetes.io/component: manager
app.kubernetes.io/created-by: kbs-operator
app.kubernetes.io/part-of: kbs-operator
app.kubernetes.io/created-by: trustee-operator
app.kubernetes.io/part-of: trustee-operator
app.kubernetes.io/managed-by: kustomize
pod-security.kubernetes.io/audit: privileged
pod-security.kubernetes.io/enforce: privileged
Expand All @@ -24,8 +24,8 @@ metadata:
app.kubernetes.io/name: deployment
app.kubernetes.io/instance: controller-manager
app.kubernetes.io/component: manager
app.kubernetes.io/created-by: kbs-operator
app.kubernetes.io/part-of: kbs-operator
app.kubernetes.io/created-by: trustee-operator
app.kubernetes.io/part-of: trustee-operator
app.kubernetes.io/managed-by: kustomize
spec:
selector:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
alm-examples: '[]'
capabilities: Basic Install
name: kbs-operator.v0.0.0
name: trustee-operator.v0.0.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -34,13 +34,13 @@ spec:
- supported: true
type: AllNamespaces
keywords:
- kbs
- kbs-operator
- trustee
- trustee-operator
- attestation-service
- rvps
links:
- name: Kbs Operator
url: https://github.com/confidential-containers/kbs-operator
url: https://github.com/confidential-containers/trustee-operator
maintainers:
- email: [email protected]
name: Pradipta Banerjee
Expand Down
4 changes: 2 additions & 2 deletions config/prometheus/monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ metadata:
app.kubernetes.io/name: servicemonitor
app.kubernetes.io/instance: controller-manager-metrics-monitor
app.kubernetes.io/component: metrics
app.kubernetes.io/created-by: kbs-operator
app.kubernetes.io/part-of: kbs-operator
app.kubernetes.io/created-by: trustee-operator
app.kubernetes.io/part-of: trustee-operator
app.kubernetes.io/managed-by: kustomize
name: controller-manager-metrics-monitor
namespace: system
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/auth_proxy_client_clusterrole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ metadata:
app.kubernetes.io/name: clusterrole
app.kubernetes.io/instance: metrics-reader
app.kubernetes.io/component: kube-rbac-proxy
app.kubernetes.io/created-by: kbs-operator
app.kubernetes.io/part-of: kbs-operator
app.kubernetes.io/created-by: trustee-operator
app.kubernetes.io/part-of: trustee-operator
app.kubernetes.io/managed-by: kustomize
name: metrics-reader
rules:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/auth_proxy_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ metadata:
app.kubernetes.io/name: clusterrole
app.kubernetes.io/instance: proxy-role
app.kubernetes.io/component: kube-rbac-proxy
app.kubernetes.io/created-by: kbs-operator
app.kubernetes.io/part-of: kbs-operator
app.kubernetes.io/created-by: trustee-operator
app.kubernetes.io/part-of: trustee-operator
app.kubernetes.io/managed-by: kustomize
name: proxy-role
rules:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/auth_proxy_role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ metadata:
app.kubernetes.io/name: clusterrolebinding
app.kubernetes.io/instance: proxy-rolebinding
app.kubernetes.io/component: kube-rbac-proxy
app.kubernetes.io/created-by: kbs-operator
app.kubernetes.io/part-of: kbs-operator
app.kubernetes.io/created-by: trustee-operator
app.kubernetes.io/part-of: trustee-operator
app.kubernetes.io/managed-by: kustomize
name: proxy-rolebinding
roleRef:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/service_account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ metadata:
app.kubernetes.io/name: serviceaccount
app.kubernetes.io/instance: controller-manager
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: kbs-operator
app.kubernetes.io/part-of: kbs-operator
app.kubernetes.io/created-by: trustee-operator
app.kubernetes.io/part-of: trustee-operator
app.kubernetes.io/managed-by: kustomize
name: controller-manager
namespace: system
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/confidential-containers/kbs-operator
module github.com/confidential-containers/trustee-operator

go 1.21

Expand Down
2 changes: 1 addition & 1 deletion internal/controller/kbsconfig_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

confidentialcontainersorgv1alpha1 "github.com/confidential-containers/kbs-operator/api/v1alpha1"
confidentialcontainersorgv1alpha1 "github.com/confidential-containers/trustee-operator/api/v1alpha1"
"github.com/go-logr/logr"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/controller/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

confidentialcontainersorgv1alpha1 "github.com/confidential-containers/kbs-operator/api/v1alpha1"
confidentialcontainersorgv1alpha1 "github.com/confidential-containers/trustee-operator/api/v1alpha1"
//+kubebuilder:scaffold:imports
)

Expand Down

0 comments on commit 55ccf3a

Please sign in to comment.