Rename operator name to sandboxed-containers-operator

.travis.yml

@@ -46,7 +46,7 @@ jobs:
 
   # Build and push the image for amd64
   - stage: deploy
-    name: Build image for kata-operator-daemon (amd64)
+    name: Build image for sandboxed-containers-operator-daemon (amd64)
     arch: amd64
     deploy:
       provider: script
@@ -58,7 +58,7 @@ jobs:
 
   # Build and push the image for ppc64le
   - stage: deploy
-    name: Build image for kata-operator-daemon (ppc64le)
+    name: Build image for sandboxed-containers-operator-daemon (ppc64le)
     arch: ppc64le
     deploy:
       provider: script
@@ -70,7 +70,7 @@ jobs:
 
   # Build and push the image for s390x
   - stage: deploy
-    name: Build image for kata-operator-daemon (s390x)
+    name: Build image for sandboxed-containers-operator-daemon (s390x)
     arch: s390x
     deploy:
       provider: script

ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 <!--
 Before reporting an issue, check our backlog of
-[open issues](https://github.com/openshift/kata-operator/issues)
+[open issues](https://github.com/openshift/sandboxed-containers-operator/issues)
 to see if someone else has already reported it. If so, feel free to add
 your scenario, or additional information, to the discussion. Or simply
 "subscribe" to it to be notified when it is updated.

Makefile

@@ -1,5 +1,5 @@
 # Current Operator version
-VERSION ?= 4.7.0
+VERSION ?= 4.8.0
 # Default bundle image tag
 BUNDLE_IMG ?= controller-bundle:$(VERSION)
 # Options for 'bundle-build'
@@ -12,7 +12,7 @@ endif
 BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 
 # Image URL to use all building/pushing image targets
-IMG ?= quay.io/jensfr/kata-operator:4.7.0
+IMG ?= quay.io/isolatedcontainers/sandboxed-containers-operator:4.8.0
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
 CRD_OPTIONS ?= "crd:trivialVersions=true"
 

PROJECT

@@ -1,7 +1,7 @@
 domain: kataconfiguration.openshift.io
 layout: go.kubebuilder.io/v2
-projectName: kata-operator
-repo: github.com/openshift/kata-operator
+projectName: sandboxed-containers-operator
+repo: github.com/openshift/sandboxed-containers-operator
 resources:
 - group: kataconfiguration
   kind: KataConfig

README.md

@@ -12,7 +12,7 @@ An operator to perform lifecycle management (install/upgrade/uninstall) of [Kata
 #### with a git repo checkout
 1. Make sure that `oc` is configured to talk to the cluster
 
-2. Clone the sandboxed containers operator repository and check out the branch matching with the Openshift version. e.g. If you are running Openshift 4.7 then,
+2. Clone the sandboxed containers operator repository and check out the branch matching with the Openshift version. e.g. If you are running Openshift 4.8 then,
 
 
    ```
@@ -22,8 +22,8 @@ An operator to perform lifecycle management (install/upgrade/uninstall) of [Kata
 3. Install the sandboxed containers operator on the cluster,
 
    ```
-   make install && make deploy IMG=quay.io/isolatedcontainers/kata-operator:4.7
-   oc adm policy add-scc-to-user privileged -z default -n kata-operator-system
+   make install && make deploy IMG=quay.io/isolatedcontainers/sandboxed-containers-operator:4.8
+   oc adm policy add-scc-to-user privileged -z default -n sandboxed-containers-operator-system
    ```
 4. To begin the installation of the kata runtime on the cluster,
 
@@ -106,7 +106,7 @@ oc delete kataconfig example-kataconfig
 ### Openshift
 1. During the installation you can watch the values of the kataconfig CR. Do `watch oc describe kataconfig example-kataconfig`.
 2. To check if the nodes in the machine config pool are going through a config update watch the machine config pool resource. For this do `watch oc get mcp kata-oc`
-3. Check the logs of the sandboxed containers operator controller pod to see detailled messages about what the steps it is executing. To find out the name of the controller pod, `oc get pods -n kata-operator-system | grep kata-operator-controller-manager` and then monitor the logs of the container `manager` in that pod. 
+3. Check the logs of the sandboxed containers operator controller pod to see detailled messages about what the steps it is executing. To find out the name of the controller pod, `oc get pods -n sandboxed-containers-operator-system | grep sandboxed-containers-operator-controller-manager` and then monitor the logs of the container `manager` in that pod. 
 
 ## Components
 
@@ -115,9 +115,9 @@ The sandboxed containers operator uses three containers:
 
 Container image name | Description | Container repository
 ---------------| ----------- | ----------
- _kata-operator_ |  It contains the controller part of the operator that watches and manages the kataconfig custom resource. It runs as a cluster scoped container. The operator itself is build with operator-sdk. | https://quay.io/isolatedcontainers/kata-operator
- _kata-operator-daemon_ | The daemon part of the operator that runs on the nodes and performs the actual installation. It pulls down the container kata-operator-payload image. Dockerfile and other content can be found in images/daemon/ subdirectory of this github repository | https://quay.io/isolatedcontainers/kata-operator-daemon
- _kata-operator-payload_ | The payload that is used by the daemon to install the kata binaries and dependencies (like e.g. QEMU). It's a container image with (currently) RPMs in it that will be installed on the chosen worker nodes by the daemon. Dockerfile and other content can be found in images/payload subdirectory of this github repository. | https://quay.io/isolatedcontaineres/kata-operator-payload
+ _sandboxed-containers-operator_ |  It contains the controller part of the operator that watches and manages the kataconfig custom resource. It runs as a cluster scoped container. The operator itself is build with operator-sdk. | https://quay.io/isolatedcontainers/sandboxed-containers-operator
+ _sandboxed-containers-operator-daemon_ | The daemon part of the operator that runs on the nodes and performs the actual installation. It pulls down the container sandboxed-containers-operator-payload image. Dockerfile and other content can be found in images/daemon/ subdirectory of this github repository | https://quay.io/isolatedcontainers/sandboxed-containers-operator-daemon
+ _sandboxed-containers-operator-payload_ | The payload that is used by the daemon to install the kata binaries and dependencies (like e.g. QEMU). It's a container image with (currently) RPMs in it that will be installed on the chosen worker nodes by the daemon. Dockerfile and other content can be found in images/payload subdirectory of this github repository. | https://quay.io/isolatedcontaineres/sandboxed-containers-operator-payload
 
 ## Upgrading Kata
 
@@ -130,4 +130,4 @@ Not implemented yet
 # Build from source
 
 1. Install operator-sdk version 1.0 or above
-2. make docker-build docker-push IMG=quay.io/<yourusername>/kata-operator:<tag>
+2. make docker-build docker-push IMG=quay.io/<yourusername>/sandboxed-containers-operator:<tag>

config/default/kustomization.yaml

@@ -1,12 +1,12 @@
 # Adds namespace to all resources.
-namespace: kata-operator-system
+namespace: sandboxed-containers-operator-system
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named
 # "wordpress" becomes "alices-wordpress".
 # Note that it should also match with the prefix (text before '-') of the namespace
 # field above.
-namePrefix: kata-operator-
+namePrefix: sandboxed-containers-operator-
 
 # Labels to add to all resources and selectors.
 #commonLabels:

config/manager/kustomization.yaml

@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: quay.io/harpatil/kata-operator
-  newTag: "0.4"
+  newName: quay.io/isolatedcontainers/sandboxed-containers-operator
+  newTag: 4.8.0

config/rbac/auth_proxy_service.yaml

@@ -3,7 +3,7 @@ kind: Service
 metadata:
   labels:
     control-plane: controller-manager
-  name: controller-manager-metrics-service
+  name: controller-manager-metrics-svc
   namespace: system
 spec:
   ports:

config/samples/catalogsource.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: openshift-marketplace
 spec:
   sourceType: grpc
-  image: quay.io/isolatedcontainers/kata-operator-catalog:latest
+  image: quay.io/isolatedcontainers/sandboxed-containers-operator-catalog:latest
   displayName: Kata container Operators
   publisher: Red Hat
   updateStrategy:

config/samples/configmap_payload.yaml

@@ -2,7 +2,7 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: payload-config
-  namespace: kata-operator-system
+  namespace: sandboxed-containers-operator-system
 data:
   # change to your custom payload repository:tag value
   daemon.payload: quay.io/user/repository:test

controllers/kataconfig_controller.go

@@ -24,7 +24,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	kataconfigurationv1 "github.com/openshift/kata-operator/api/v1"
+	kataconfigurationv1 "github.com/openshift/sandboxed-containers-operator/api/v1"
 )
 
 // KataConfigReconciler reconciles a KataConfig object

controllers/kubernetes_controller.go

@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	kataconfigurationv1 "github.com/openshift/kata-operator/api/v1"
+	kataconfigurationv1 "github.com/openshift/sandboxed-containers-operator/api/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	nodeapi "k8s.io/api/node/v1beta1"
@@ -275,7 +275,7 @@ func (r *KataConfigKubernetesReconciler) processDaemonset(operation DaemonOperat
 	var runAsUser int64 = 0
 	hostPt := corev1.HostPathType("DirectoryOrCreate")
 
-	dsName := "kata-operator-daemon-" + string(operation)
+	dsName := "sandboxed-containers-operator-daemon-" + string(operation)
 	labels := map[string]string{
 		"name": dsName,
 	}
@@ -296,7 +296,7 @@ func (r *KataConfigKubernetesReconciler) processDaemonset(operation DaemonOperat
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      dsName,
-			Namespace: "kata-operator",
+			Namespace: "sandboxed-containers-operator",
 		},
 		Spec: appsv1.DaemonSetSpec{
 			Selector: &metav1.LabelSelector{
@@ -316,7 +316,7 @@ func (r *KataConfigKubernetesReconciler) processDaemonset(operation DaemonOperat
 					Labels: labels,
 				},
 				Spec: corev1.PodSpec{
-					ServiceAccountName: "kata-operator",
+					ServiceAccountName: "sandboxed-containers-operator",
 					NodeSelector:       nodeSelector,
 					Containers: []corev1.Container{
 						{

controllers/openshift_controller.go

@@ -27,8 +27,8 @@ import (
 
 	ignTypes "github.com/coreos/ignition/config/v2_2/types"
 	"github.com/go-logr/logr"
-	kataconfigurationv1 "github.com/openshift/kata-operator/api/v1"
 	mcfgv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	kataconfigurationv1 "github.com/openshift/sandboxed-containers-operator/api/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	nodeapi "k8s.io/api/node/v1beta1"
@@ -130,7 +130,7 @@ func (r *KataConfigOpenShiftReconciler) processDaemonsetForCR(operation DaemonOp
 		trueValue               = true
 	)
 
-	dsName := "kata-operator-daemon-" + string(operation)
+	dsName := "sandboxed-containers-operator-daemon-" + string(operation)
 	labels := map[string]string{
 		"name": dsName,
 	}
@@ -151,7 +151,7 @@ func (r *KataConfigOpenShiftReconciler) processDaemonsetForCR(operation DaemonOp
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      dsName,
-			Namespace: "kata-operator-system",
+			Namespace: "sandboxed-containers-operator-system",
 		},
 		Spec: appsv1.DaemonSetSpec{
 			Selector: &metav1.LabelSelector{
@@ -167,7 +167,7 @@ func (r *KataConfigOpenShiftReconciler) processDaemonsetForCR(operation DaemonOp
 					Containers: []corev1.Container{
 						{
 							Name:            "kata-install-pod",
-							Image:           "quay.io/isolatedcontainers/kata-operator-daemon@sha256:b38280effcd923d88fc80de8802238ff82bfc5b1a92bfc25cc618d0146b6a04e",
+							Image:           "quay.io/isolatedcontainers/sandboxed-containers-operator-daemon@sha256:84df0ddc078c3dee27074d419f85dae715f8667c95e37ebf01fb7e45b083c721",
 							ImagePullPolicy: "Always",
 							SecurityContext: &corev1.SecurityContext{
 								Privileged: &runPrivileged,
@@ -349,7 +349,7 @@ WantedBy=multi-user.target
 				"machineconfiguration.openshift.io/role": machinePool,
 				"app":                                    r.kataConfig.Name,
 			},
-			Namespace: "kata-operator",
+			Namespace: "sandboxed-containers-operator",
 		},
 		Spec: mcfgv1.MachineConfigSpec{
 			Config: runtime.RawExtension{
@@ -497,7 +497,7 @@ func (r *KataConfigOpenShiftReconciler) processKataConfigInstallRequest() (ctrl.
 
 	if r.kataConfig.Status.KataImage == "" {
 		// TODO - placeholder. This will change in future.
-		r.kataConfig.Status.KataImage = "quay.io/kata-operator/kata-artifacts:1.0"
+		r.kataConfig.Status.KataImage = "quay.io/sandboxed-containers-operator/kata-artifacts:1.0"
 	}
 
 	// Don't create the daemonset if kata is already installed on the cluster nodes

controllers/openshift_controller_test.go

@@ -6,7 +6,7 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	kataconfigurationv1 "github.com/openshift/kata-operator/api/v1"
+	kataconfigurationv1 "github.com/openshift/sandboxed-containers-operator/api/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 )

controllers/suite_test.go

@@ -33,7 +33,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	kataconfigurationv1 "github.com/openshift/kata-operator/api/v1"
+	kataconfigurationv1 "github.com/openshift/sandboxed-containers-operator/api/v1"
 	// +kubebuilder:scaffold:imports
 )
 

deploy/deploy.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-oc apply -f https://raw.githubusercontent.com/openshift/kata-operator/master/deploy/deploy.yaml && \
-oc adm policy add-scc-to-user privileged -z default -n kata-operator-system
+oc apply -f https://raw.githubusercontent.com/openshift/sandboxed-containers-operator/master/deploy/deploy.yaml && \
+oc adm policy add-scc-to-user privileged -z default -n sandboxed-containers-operator-system