From b327d5467550f00c09448536e3c7667aaea5478e Mon Sep 17 00:00:00 2001 From: Le Zhang Date: Thu, 18 Apr 2024 11:35:58 -0400 Subject: [PATCH 1/2] Issue open-horizon#4040 - Cluster agent pod and cronjob pod in same k8s node Signed-off-by: Le Zhang --- agent-install/k8s/auto-upgrade-cronjob-template.yml | 10 ++++++++++ agent-install/k8s/deployment-template.yml | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/agent-install/k8s/auto-upgrade-cronjob-template.yml b/agent-install/k8s/auto-upgrade-cronjob-template.yml index 6b296e73f..0b559656b 100644 --- a/agent-install/k8s/auto-upgrade-cronjob-template.yml +++ b/agent-install/k8s/auto-upgrade-cronjob-template.yml @@ -21,6 +21,16 @@ spec: openhorizon.org/component: agent type: auto-upgrade-cronjob spec: + affinity: + podAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: openhorizon.org/component + operator: In + values: + - agent + topologyKey: kubernetes.io/hostname volumes: - name: agent-pvc-storage persistentVolumeClaim: diff --git a/agent-install/k8s/deployment-template.yml b/agent-install/k8s/deployment-template.yml index 5206b7648..8460de521 100644 --- a/agent-install/k8s/deployment-template.yml +++ b/agent-install/k8s/deployment-template.yml @@ -18,6 +18,16 @@ spec: app: agent openhorizon.org/component: agent spec: + affinity: + podAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: openhorizon.org/component + operator: In + values: + - agent + topologyKey: kubernetes.io/hostname serviceAccountName: agent-service-account volumes: - name: agent-etc-vol From a35029d16ad753891269c56e1feb171f86e296e6 Mon Sep 17 00:00:00 2001 From: Max McAdam Date: Tue, 7 May 2024 08:03:16 -0700 Subject: [PATCH 2/2] Issue #4054 - Bug: cannot publish an nmp manifest with * for the file list Signed-off-by: Max McAdam --- cli/node_management/manifest.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cli/node_management/manifest.go b/cli/node_management/manifest.go index 03cfd2545..1743cc102 100644 --- a/cli/node_management/manifest.go +++ b/cli/node_management/manifest.go @@ -268,6 +268,9 @@ func checkManifestFile(org, credToUse string, manifestData AgentUpgradeManifestD } mmsSoftwareFiles := getAgentFiles(org, credToUse, "agent_software_files", manSoftwareFilesVersion) for _, manFile := range manSoftwareFiles { + if manFile == "*" { + continue + } found := false for _, mmsFile := range mmsSoftwareFiles { if mmsFile.AgentFileName == manFile { @@ -296,6 +299,9 @@ func checkManifestFile(org, credToUse string, manifestData AgentUpgradeManifestD } mmsCertFiles := getAgentFiles(org, credToUse, "agent_cert_files", manCertFilesVersion) for _, manFile := range manCertFiles { + if manFile == "*" { + continue + } found := false for _, mmsFile := range mmsCertFiles { if mmsFile.AgentFileName == manFile { @@ -324,6 +330,9 @@ func checkManifestFile(org, credToUse string, manifestData AgentUpgradeManifestD } mmsConfigFiles := getAgentFiles(org, credToUse, "agent_config_files", manConfigFilesVersion) for _, manFile := range manConfigFiles { + if manFile == "*" { + continue + } found := false for _, mmsFile := range mmsConfigFiles { if mmsFile.AgentFileName == manFile {