Merge pull request #41 from replicatedhq/metadata-fallback

Use the proxied, portforwarded address
replicatedhq · Sep 8, 2019 · e46e719 · e46e719
2 parents 8562e79 + 60303ed
commit e46e719
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/pkg/kotsadm/api_objects.go b/pkg/kotsadm/api_objects.go
@@ -86,7 +86,7 @@ func apiDeployment(namespace string) *appsv1.Deployment {
 								},
 								{
 									Name:  "SHIP_API_ADVERTISE_ENDPOINT",
-									Value: fmt.Sprintf("http://kotsadm-api.%s.svc.cluster.local:3000", namespace),
+									Value: "http://localhost:8800",
 								},
 								{
 									Name:  "S3_ENDPOINT",

diff --git a/pkg/kotsadm/operator.go b/pkg/kotsadm/operator.go
@@ -27,6 +27,12 @@ func getOperatorYAML(namespace string) (map[string][]byte, error) {
 	}
 	docs["operator-rolebinding.yaml"] = roleBinding.Bytes()
 
+	var serviceAccount bytes.Buffer
+	if err := s.Encode(operatorServiceAccount(namespace), &serviceAccount); err != nil {
+		return nil, errors.Wrap(err, "failed to marshal operator service account")
+	}
+	docs["operator-serviceaccount.yaml"] = serviceAccount.Bytes()
+
 	var deployment bytes.Buffer
 	if err := s.Encode(operatorDeployment(namespace), &deployment); err != nil {
 		return nil, errors.Wrap(err, "failed to marshal operator deployment")
@@ -57,6 +63,10 @@ func ensureOperatorRBAC(namespace string, clientset *kubernetes.Clientset) error
 		return errors.Wrap(err, "failed to ensure operator role binding")
 	}
 
+	if err := ensureOperatorServiceAccount(namespace, clientset); err != nil {
+		return errors.Wrap(err, "failed to ensure operator service account")
+	}
+
 	return nil
 }
 
@@ -92,6 +102,22 @@ func ensureOperatorRoleBinding(namespace string, clientset *kubernetes.Clientset
 	return nil
 }
 
+func ensureOperatorServiceAccount(namespace string, clientset *kubernetes.Clientset) error {
+	_, err := clientset.CoreV1().ServiceAccounts(namespace).Get("kotsadm-operator-serviceaccount", metav1.GetOptions{})
+	if err != nil {
+		if !kuberneteserrors.IsNotFound(err) {
+			return errors.Wrap(err, "failed to get serviceaccouont")
+		}
+
+		_, err := clientset.CoreV1().ServiceAccounts(namespace).Create(operatorServiceAccount(namespace))
+		if err != nil {
+			return errors.Wrap(err, "failed to create serviceaccount")
+		}
+	}
+
+	return nil
+}
+
 func ensureOperatorDeployment(deployOptions DeployOptions, clientset *kubernetes.Clientset) error {
 	_, err := clientset.AppsV1().Deployments(deployOptions.Namespace).Get("kotsadm-operator", metav1.GetOptions{})
 	if err != nil {

diff --git a/pkg/kotsadm/operator_objects.go b/pkg/kotsadm/operator_objects.go
@@ -44,7 +44,7 @@ func operatorRoleBinding(namespace string) *rbacv1.RoleBinding {
 		Subjects: []rbacv1.Subject{
 			{
 				Kind:      "ServiceAccount",
-				Name:      "default",
+				Name:      "kotsadm-operator",
 				Namespace: namespace,
 			},
 		},
@@ -58,6 +58,21 @@ func operatorRoleBinding(namespace string) *rbacv1.RoleBinding {
 	return roleBinding
 }
 
+func operatorServiceAccount(namespace string) *corev1.ServiceAccount {
+	serviceAccount := &corev1.ServiceAccount{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "v1",
+			Kind:       "ServiceAccount",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "kotsadm-operator",
+			Namespace: namespace,
+		},
+	}
+
+	return serviceAccount
+}
+
 func operatorDeployment(namespace string) *appsv1.Deployment {
 	deployment := &appsv1.Deployment{
 		TypeMeta: metav1.TypeMeta{
@@ -81,7 +96,8 @@ func operatorDeployment(namespace string) *appsv1.Deployment {
 					},
 				},
 				Spec: corev1.PodSpec{
-					RestartPolicy: corev1.RestartPolicyAlways,
+					ServiceAccountName: "kotsadm-operator",
+					RestartPolicy:      corev1.RestartPolicyAlways,
 					Containers: []corev1.Container{
 						{
 							Image:           "kotsadm/kotsadm-operator:alpha",