Renamed ControlAgent to NodeControl
This commit is contained in:
@@ -13,6 +13,7 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/intstr"
|
||||
|
||||
monov1alpha1 "example.com/monok8s/pkg/apis/monok8s/v1alpha1"
|
||||
buildinfo "example.com/monok8s/pkg/buildinfo"
|
||||
templates "example.com/monok8s/pkg/templates"
|
||||
)
|
||||
|
||||
@@ -20,10 +21,10 @@ func RenderControllerDeployments(namespace string) (string, error) {
|
||||
vals := templates.LoadTemplateValuesFromEnv()
|
||||
|
||||
labels := map[string]string{
|
||||
"app.kubernetes.io/name": monov1alpha1.ControlAgentName,
|
||||
"app.kubernetes.io/name": monov1alpha1.ControllerName,
|
||||
"app.kubernetes.io/component": "controller",
|
||||
"app.kubernetes.io/part-of": "monok8s",
|
||||
"app.kubernetes.io/managed-by": "ctl",
|
||||
"app.kubernetes.io/managed-by": monov1alpha1.NodeControlName,
|
||||
}
|
||||
|
||||
objs := []runtime.Object{
|
||||
@@ -66,7 +67,7 @@ func buildControllerServiceAccount(namespace string, labels map[string]string) *
|
||||
Kind: "ServiceAccount",
|
||||
},
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: monov1alpha1.ControlAgentName,
|
||||
Name: monov1alpha1.ControllerName,
|
||||
Namespace: namespace,
|
||||
Labels: labels,
|
||||
},
|
||||
@@ -109,7 +110,7 @@ func buildControllerClusterRole(labels map[string]string) *rbacv1.ClusterRole {
|
||||
Kind: "ClusterRole",
|
||||
},
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: monov1alpha1.ControlAgentName,
|
||||
Name: monov1alpha1.ControllerName,
|
||||
Labels: labels,
|
||||
},
|
||||
Rules: wantRules,
|
||||
@@ -121,7 +122,7 @@ func buildControllerClusterRoleBinding(namespace string, labels map[string]strin
|
||||
wantSubjects := []rbacv1.Subject{
|
||||
{
|
||||
Kind: "ServiceAccount",
|
||||
Name: monov1alpha1.ControlAgentName,
|
||||
Name: monov1alpha1.ControllerName,
|
||||
Namespace: namespace,
|
||||
},
|
||||
}
|
||||
@@ -129,7 +130,7 @@ func buildControllerClusterRoleBinding(namespace string, labels map[string]strin
|
||||
wantRoleRef := rbacv1.RoleRef{
|
||||
APIGroup: rbacv1.GroupName,
|
||||
Kind: "ClusterRole",
|
||||
Name: monov1alpha1.ControlAgentName,
|
||||
Name: monov1alpha1.ControllerName,
|
||||
}
|
||||
|
||||
return &rbacv1.ClusterRoleBinding{
|
||||
@@ -138,7 +139,7 @@ func buildControllerClusterRoleBinding(namespace string, labels map[string]strin
|
||||
Kind: "ClusterRoleBinding",
|
||||
},
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: monov1alpha1.ControlAgentName,
|
||||
Name: monov1alpha1.ControllerName,
|
||||
Labels: labels,
|
||||
},
|
||||
Subjects: wantSubjects,
|
||||
@@ -150,7 +151,7 @@ func buildControllerDeployment(tVals templates.TemplateValues, namespace string,
|
||||
replicas := int32(1)
|
||||
|
||||
selectorLabels := map[string]string{
|
||||
"app.kubernetes.io/name": monov1alpha1.ControlAgentName,
|
||||
"app.kubernetes.io/name": monov1alpha1.ControllerName,
|
||||
"app.kubernetes.io/component": "controller",
|
||||
}
|
||||
|
||||
@@ -165,7 +166,7 @@ func buildControllerDeployment(tVals templates.TemplateValues, namespace string,
|
||||
Kind: "Deployment",
|
||||
},
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: monov1alpha1.ControlAgentName,
|
||||
Name: monov1alpha1.ControllerName,
|
||||
Namespace: namespace,
|
||||
Labels: labels,
|
||||
},
|
||||
@@ -179,11 +180,11 @@ func buildControllerDeployment(tVals templates.TemplateValues, namespace string,
|
||||
Labels: podLabels,
|
||||
},
|
||||
Spec: corev1.PodSpec{
|
||||
ServiceAccountName: monov1alpha1.ControlAgentName,
|
||||
ServiceAccountName: monov1alpha1.ControllerName,
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "controller",
|
||||
Image: fmt.Sprintf("registry.local/control-agent:%s", tVals.KubernetesVersion),
|
||||
Image: fmt.Sprintf("localhost/monok8s/node-control:%s", buildinfo.Version),
|
||||
ImagePullPolicy: corev1.PullIfNotPresent,
|
||||
Args: []string{
|
||||
"controller",
|
||||
|
||||
Reference in New Issue
Block a user