Update ArgoCD Operator API to latest version

- Update CRDs with latest API definitions
- Migrate Principal/Agent specs: move 5 fields to top level
- Add LoadBalancer service and disable Route for Principal

Signed-off-by: Mike Ng <[email protected]>

Author: mikeshng

charts/argocd-agent-addon/Chart.yaml

@@ -3,4 +3,4 @@ appVersion: 0.1.0
 description: Argo CD Agent Addon for Open Cluster Management
 name: argocd-agent-addon
 type: application
-version: 0.23.0
+version: 0.24.0

charts/argocd-agent-addon/crds/argocd-operator-crds.yaml

@@ -11,9 +11,15 @@ spec:
   argoCDAgent:
     principal:
       enabled: true
+      auth: "mtls:CN=system:open-cluster-management:cluster:([^:]+):addon:argocd-agent-addon:agent:argocd-agent-addon-agent"
+      image: {{ .Values.argoCDAgentImage }}:{{ .Values.argoCDAgentTag }}
       server:
-        auth: "mtls:CN=system:open-cluster-management:cluster:([^:]+):addon:argocd-agent-addon:agent:argocd-agent-addon-agent"
-        image: {{ .Values.argoCDAgentImage }}:{{ .Values.argoCDAgentTag }}
+        enableWebSocket: false
+        keepAliveMinInterval: "30s"
+        service:
+          type: LoadBalancer
+        route:
+          enabled: false
       namespace:
         allowedNamespaces:
           - "*"

charts/argocd-agent-addon/templates/argocd-operator/argocd.yaml

@@ -419,7 +419,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.annotations['olm.targetNamespaces']
-        image: {{ .Values.argoCDOperatorImage }}:{{ .Values.argoCDOperatorTag }}
+        image: {{ .Values.operatorImage }}:{{ .Values.operatorImageTag }}
         livenessProbe:
           httpGet:
             path: /healthz

charts/argocd-agent-addon/templates/argocd-operator/operator.yaml

@@ -9,7 +9,7 @@ addonTag: latest
 
 # ArgoCD operator image
 argoCDOperatorImage: quay.io/mikeshng/argocd-operator
-argoCDOperatorTag: latest
+argoCDOperatorTag: latest-api
 
 # ArgoCD agent image
 argoCDAgentImage: ghcr.io/argoproj-labs/argocd-agent/argocd-agent

charts/argocd-agent-addon/values.yaml

@@ -10,5 +10,5 @@ spec:
     name: placement
   argoCDAgentAddon:
     mode: managed
-    operatorImage: quay.io/mikeshng/argocd-operator:latest
+    operatorImage: quay.io/mikeshng/argocd-operator:latest-api
     agentImage: ghcr.io/argoproj-labs/argocd-agent/argocd-agent:latest

examples/gitopscluster.yaml

@@ -30,7 +30,7 @@ import (
 
 // Default images (used when not specified)
 const (
-	defaultOperatorImage = "quay.io/mikeshng/argocd-operator:latest"
+	defaultOperatorImage = "quay.io/mikeshng/argocd-operator:latest-api"
 	defaultAgentImage    = "ghcr.io/argoproj-labs/argocd-agent/argocd-agent:latest"
 )
 

internal/addon/addon_install.go

@@ -2,5 +2,5 @@ apiVersion: v2
 name: argocd-agent-addon
 description: Argo CD Agent Addon
 type: application
-version: 0.23.0
-appVersion: "0.23.0"
+version: 0.24.0
+appVersion: "0.24.0"

internal/addon/charts/argocd-agent-addon/Chart.yaml

@@ -9,14 +9,16 @@ spec:
   argoCDAgent:
     agent:
       enabled: true
+      creds: "mtls:open-cluster-management:cluster:([^:]+):addon:argocd-agent"
+      logLevel: "info"
+      logFormat: "text"
+      image: {{ .Values.global.argoCDAgent.image }}:{{ .Values.global.argoCDAgent.tag }}
       client:
         principalServerAddress: {{ .Values.global.argoCDAgent.serverAddress }}
         principalServerPort: "{{ .Values.global.argoCDAgent.serverPort }}"
-        logLevel: "info"
-        logFormat: "text"
-        image: {{ .Values.global.argoCDAgent.image }}:{{ .Values.global.argoCDAgent.tag }}
         mode: {{ .Values.global.argoCDAgent.mode }}
-        creds: "mtls:open-cluster-management:cluster:([^:]+):addon:argocd-agent"
+        enableWebSocket: false
+        enableCompression: false
         keepAliveInterval: "50s"
       tls:
         secretName: "argocd-agent-open-cluster-management.io-argocd-agent-addon-client-cert"