Merge pull request #18 from faroshq/grab.a.bag.part2

version fallback

Author: mjudeikis

deploy/charts/kedge-agent/templates/deployment.yaml

@@ -23,6 +23,10 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.hostAliases }}
+      hostAliases:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       serviceAccountName: {{ include "kedge-agent.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -38,6 +42,9 @@ spec:
             {{- if .Values.agent.hub.context }}
             - --hub-context={{ .Values.agent.hub.context }}
             {{- end }}
+            {{- if .Values.agent.hub.url }}
+            - --hub-url={{ .Values.agent.hub.url }}
+            {{- end }}
             {{- if .Values.agent.tunnelURL }}
             - --tunnel-url={{ .Values.agent.tunnelURL }}
             {{- end }}

deploy/charts/kedge-agent/values.yaml

@@ -26,6 +26,9 @@ agent:
     kubeconfig: ""
     # -- Optional: kubeconfig context to use
     context: ""
+    # -- Optional: override hub URL (useful for dev environments where the
+    # kubeconfig server URL differs from the actual reachable URL)
+    url: ""
 
   # -- Optional: separate tunnel URL (defaults to hub URL from kubeconfig)
   tunnelURL: ""
@@ -56,6 +59,14 @@ nodeSelector: {}
 tolerations: []
 affinity: {}
 podAnnotations: {}
+
+# -- Host aliases to add to the pod (useful for dev environments)
+# Example:
+#   hostAliases:
+#     - ip: "172.18.0.2"
+#       hostnames:
+#         - "kedge.localhost"
+hostAliases: []
 podSecurityContext:
   fsGroup: 65534
 securityContext:

pkg/agent/agent.go

@@ -81,6 +81,10 @@ func New(opts *Options) (*Agent, error) {
 		if err != nil {
 			return nil, fmt.Errorf("failed to build hub config from kubeconfig: %w", err)
 		}
+		// Allow HubURL to override the kubeconfig's server URL (useful for dev environments)
+		if opts.HubURL != "" {
+			hubConfig.Host = opts.HubURL
+		}
 	} else if opts.HubURL != "" {
 		hubConfig = &rest.Config{
 			Host:        opts.HubURL,

pkg/cli/cmd/dev/plugin/create.go

@@ -61,12 +61,13 @@ type DevOptions struct {
 	AgentClusterName    string
 	WaitForReadyTimeout time.Duration
 	ChartPath           string
+	AgentChartPath      string
 	ChartVersion        string
 	KindNetwork         string
 }
 
 // fallbackAssetVersion is used when unable to fetch the latest version
-const fallbackAssetVersion = "0.1.0"
+const fallbackAssetVersion = "0.0.1"
 
 // gitHubRelease represents a GitHub release response
 type gitHubRelease struct {
@@ -80,6 +81,7 @@ func NewDevOptions(streams genericclioptions.IOStreams) *DevOptions {
 		HubClusterName:   "kedge-hub",
 		AgentClusterName: "kedge-agent",
 		ChartPath:        "deploy/charts/kedge-hub",
+		AgentChartPath:   "oci://ghcr.io/faroshq/charts/kedge-agent",
 		ChartVersion:     fallbackAssetVersion,
 	}
 }
@@ -89,7 +91,8 @@ func (o *DevOptions) AddCmdFlags(cmd *cobra.Command) {
 	cmd.Flags().StringVar(&o.HubClusterName, "hub-cluster-name", "kedge-hub", "Name of the hub cluster in dev mode")
 	cmd.Flags().StringVar(&o.AgentClusterName, "agent-cluster-name", "kedge-agent", "Name of the agent cluster in dev mode")
 	cmd.Flags().DurationVar(&o.WaitForReadyTimeout, "wait-for-ready-timeout", 2*time.Minute, "Timeout for waiting for the cluster to be ready")
-	cmd.Flags().StringVar(&o.ChartPath, "chart-path", o.ChartPath, "Helm chart path or OCI registry URL")
+	cmd.Flags().StringVar(&o.ChartPath, "chart-path", o.ChartPath, "Helm chart path or OCI registry URL for hub")
+	cmd.Flags().StringVar(&o.AgentChartPath, "agent-chart-path", o.AgentChartPath, "Helm chart path or OCI registry URL for agent")
 	cmd.Flags().StringVar(&o.ChartVersion, "chart-version", o.ChartVersion, "Helm chart version")
 	cmd.Flags().StringVar(&o.Image, "image", "ghcr.io/faroshq/kedge-hub", "kedge hub image to use in dev mode")
 	cmd.Flags().StringVar(&o.Tag, "tag", "", "kedge hub image tag to use in dev mode")
@@ -127,7 +130,7 @@ func fetchLatestRelease() (string, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
 
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, "https://api.github.com/repos/faroshq/faros-kedge/releases/latest", nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, "https://api.github.com/repos/faroshq/kedge/releases/latest", nil)
 	if err != nil {
 		return "", fmt.Errorf("failed to create request: %w", err)
 	}
@@ -185,9 +188,6 @@ nodes:
 
 var agentClusterConfig = `apiVersion: kind.x-k8s.io/v1alpha4
 kind: Cluster
-networking:
-  apiServerAddress: "0.0.0.0"
-  apiServerPort: 6443
 nodes:
 - role: control-plane
 `
@@ -279,13 +279,20 @@ func (o *DevOptions) runWithColors(ctx context.Context) error {
 		o.AgentClusterName, o.AgentClusterName)))
 
 	_, _ = fmt.Fprint(o.Streams.ErrOut, "   Then install the agent Helm chart:\n")
-	_, _ = fmt.Fprintf(o.Streams.ErrOut, "%s\n\n", blueCommand(fmt.Sprintf(
-		"helm install kedge-agent deploy/charts/kedge-agent \\\n     --kubeconfig %s.kubeconfig \\\n     -n kedge-system \\\n     --set agent.siteName=my-site \\\n     --set agent.hub.existingSecret=site-kubeconfig",
-		o.AgentClusterName)))
-
 	if hubIP != "" {
-		_, _ = fmt.Fprint(o.Streams.ErrOut, "   Note: The agent connects to the hub via the Docker network.\n")
-		_, _ = fmt.Fprintf(o.Streams.ErrOut, "   Hub is reachable at: https://%s:8443 from within the kind network.\n\n", hubIP)
+		// Use hub.url to override the kubeconfig server URL with the correct NodePort address
+		// The kubeconfig has kedge.localhost:8443 which works from host, but from within
+		// the Docker network we need to use the hub's IP and NodePort 31443
+		_, _ = fmt.Fprintf(o.Streams.ErrOut, "%s\n\n", blueCommand(fmt.Sprintf(
+			"helm install kedge-agent %s --version %s \\\n     --kubeconfig %s.kubeconfig \\\n     -n kedge-system \\\n     --set agent.siteName=my-site \\\n     --set agent.hub.existingSecret=site-kubeconfig \\\n     --set agent.hub.url=https://%s:31443",
+			o.AgentChartPath, o.ChartVersion, o.AgentClusterName, hubIP)))
+	} else {
+		_, _ = fmt.Fprintf(o.Streams.ErrOut, "%s\n\n", blueCommand(fmt.Sprintf(
+			"helm install kedge-agent %s --version %s \\\n     --kubeconfig %s.kubeconfig \\\n     -n kedge-system \\\n     --set agent.siteName=my-site \\\n     --set agent.hub.existingSecret=site-kubeconfig",
+			o.AgentChartPath, o.ChartVersion, o.AgentClusterName)))
+		_, _ = fmt.Fprint(o.Streams.ErrOut, "   Note: You may need to set agent.hub.url to the hub's Docker network IP and NodePort.\n")
+		_, _ = fmt.Fprint(o.Streams.ErrOut, "   Get hub IP: docker inspect kedge-hub-control-plane | jq -r '.[0].NetworkSettings.Networks[\"kedge-dev\"].IPAddress'\n")
+		_, _ = fmt.Fprint(o.Streams.ErrOut, "   Then add: --set agent.hub.url=https://<HUB_IP>:31443\n\n")
 	}
 
 	_, _ = fmt.Fprint(o.Streams.ErrOut, "Useful commands:\n")