Merge "nodepool-builder - log expose - slight refactor"

controllers/nodepool.go

@@ -350,7 +350,6 @@ func (r *SFController) DeployNodepoolBuilder(statsdExporterVolume apiv1.Volume,
 		base.MkVolumeSecret(NodepoolProvidersSecretsName),
 		base.MkEmptyDirVolume("nodepool-config"),
 		base.MkEmptyDirVolume("nodepool-home-ssh"),
-		base.MkEmptyDirVolume("nodepool-log"),
 		r.commonToolingVolume(),
 		{
 			Name: "nodepool-builder-ssh-key",
@@ -380,10 +379,6 @@ func (r *SFController) DeployNodepoolBuilder(statsdExporterVolume apiv1.Volume,
 			Name:      builderIdent,
 			MountPath: "/var/lib/nodepool",
 		},
-		{
-			Name:      "nodepool-log",
-			MountPath: "/var/log/nodepool",
-		},
 		configScriptVolumeMount,
 		{
 			Name:      "nodepool-tooling-vol",
@@ -426,12 +421,12 @@ func (r *SFController) DeployNodepoolBuilder(statsdExporterVolume apiv1.Volume,
 		"statsd_mapping":         utils.Checksum([]byte(nodepoolStatsdMappingConfig)),
 		// When the Secret ResourceVersion field change (when edited) we force a nodepool-builder restart
 		"nodepool-providers-secrets": string(nodepoolProvidersSecrets.ResourceVersion),
-		"serial":                     "7",
+		"serial":                     "8",
 	}
 
 	initContainer := base.MkContainer("nodepool-builder-init", base.BusyboxImage)
 
-	initContainer.Command = []string{"bash", "-c", "mkdir -p ~/dib; /usr/local/bin/generate-config.sh"}
+	initContainer.Command = []string{"bash", "-c", "mkdir -p ~/dib ~/builds; /usr/local/bin/generate-config.sh"}
 	initContainer.Env = append(r.getNodepoolConfigEnvs(),
 		base.MkEnvVar("NODEPOOL_CONFIG_FILE", "nodepool-builder.yaml"),
 	)
@@ -469,8 +464,9 @@ func (r *SFController) DeployNodepoolBuilder(statsdExporterVolume apiv1.Volume,
 	buildLogsContainer := base.MkContainer("build-logs-httpd", HTTPDImage)
 	buildLogsContainer.VolumeMounts = []apiv1.VolumeMount{
 		{
-			Name:      "nodepool-log",
-			MountPath: "/var/www/html/dib",
+			Name:      builderIdent,
+			SubPath:   "builds",
+			MountPath: "/var/www/html/builds",
 		},
 		{
 			Name:      "nodepool-builder-extra-config-vol",
@@ -481,9 +477,9 @@ func (r *SFController) DeployNodepoolBuilder(statsdExporterVolume apiv1.Volume,
 	buildLogsContainer.Ports = []apiv1.ContainerPort{
 		base.MkContainerPort(buildLogsHttpdPort, buildLogsHttpdPortName),
 	}
-	buildLogsContainer.ReadinessProbe = base.MkReadinessHTTPProbe("/dib", buildLogsHttpdPort)
-	buildLogsContainer.StartupProbe = base.MkStartupHTTPProbe("/dib", buildLogsHttpdPort)
-	buildLogsContainer.LivenessProbe = base.MkLiveHTTPProbe("/dib", buildLogsHttpdPort)
+	buildLogsContainer.ReadinessProbe = base.MkReadinessHTTPProbe("/builds", buildLogsHttpdPort)
+	buildLogsContainer.StartupProbe = base.MkStartupHTTPProbe("/builds", buildLogsHttpdPort)
+	buildLogsContainer.LivenessProbe = base.MkLiveHTTPProbe("/builds", buildLogsHttpdPort)
 	nb.Spec.Template.Spec.Containers = append(nb.Spec.Template.Spec.Containers,
 		buildLogsContainer,
 	)
@@ -508,9 +504,7 @@ func (r *SFController) DeployNodepoolBuilder(statsdExporterVolume apiv1.Volume,
 	pvcReadiness := r.reconcileExpandPVC(builderIdent+"-"+builderIdent+"-0", r.cr.Spec.Nodepool.Builder.Storage)
 
 	routeReady := r.ensureHTTPSRoute(r.cr.Name+"-nodepool-builder", "nodepool", buildLogsHttpdPortName, "/builds",
-		buildLogsHttpdPort, map[string]string{
-			"haproxy.router.openshift.io/rewrite-target": "/dib",
-		}, r.cr.Spec.FQDN, r.cr.Spec.LetsEncrypt)
+		buildLogsHttpdPort, map[string]string{}, r.cr.Spec.FQDN, r.cr.Spec.LetsEncrypt)
 
 	var isReady = r.IsStatefulSetReady(&current) && routeReady && pvcReadiness
 

controllers/static/nodepool/generate-config.sh

@@ -22,6 +22,7 @@ zookeeper-tls:
   key: /tls/client/tls.key
 # images-dir is mandatory key for nodepool-builder process
 images-dir: /var/lib/nodepool/dib
+build-log-dir: /var/lib/nodepool/builds/logs
 EOF
 
 if [ "$CONFIG_REPO_SET" == "TRUE" ]; then

controllers/static/nodepool/httpd-build-logs-dir.conf

@@ -1,7 +1,7 @@
 <VirtualHost *>
   AddType text/plain .log
 
-  <Directory "/var/www/html/dib/">
+  <Directory "/var/www/html/builds/">
       Options Indexes SymLinksIfOwnerMatch
       Require all granted
       IndexOptions FancyIndexing HTMLTable NameWidth=* SuppressDescription

controllers/utils.go

@@ -239,14 +239,30 @@ func (r *SFUtilContext) ensureRoute(route apiroutev1.Route, name string) bool {
 		return false
 	} else {
 		// Route already exist - check if we need to update the Route
-		// Use the String repr of the RouteSpec to compare for changes
+		needUpdate := false
+
+		// First check the route annotations
+		if (len(route.Annotations) == 0 && len(current.Annotations) != 0) || (len(route.Annotations) != 0 && len(current.Annotations) == 0) {
+			current.Annotations = route.Annotations
+			needUpdate = true
+		}
+		if len(route.Annotations) != 0 && len(current.Annotations) != 0 {
+			if !utils.MapEquals(&route.Annotations, &current.Annotations) {
+				current.Annotations = route.Annotations
+				needUpdate = true
+			}
+		}
+
+		// Use the String repr of the RouteSpec to compare for Spec changes
 		// This comparaison mechanics may fail in case of some Route Spec default values
 		// not specified in the wanted version.
-		wantedRepr := route.Spec.String()
-		currentRepr := current.Spec.String()
-		if wantedRepr != currentRepr {
-			r.log.V(1).Info("Updating route...", "name", name)
+		if route.Spec.String() != current.Spec.String() {
 			current.Spec = route.Spec
+			needUpdate = true
+		}
+
+		if needUpdate {
+			r.log.V(1).Info("Updating route...", "name", name)
 			r.UpdateR(&current)
 			return false
 		}

roles/health-check/check-service-uri/tasks/main.yaml

@@ -89,13 +89,13 @@
 
 - name: Attempt to access Nodepool builder build logs
   ansible.builtin.uri:
-    url: "https://{{ nodepool_host }}/builds/"
+    url: "https://{{ nodepool_host }}/builds"
     method: GET
     return_content: true
     validate_certs: "{{ validate_certs }}"
     status_code: [200, 503]
   register: this
   until:
     - this.status == 200
-    - "'Index of /dib' in this.content"
+    - "'Index of /builds' in this.content"
   retries: "{{ retries }}"

roles/health-check/config-update-nodepool-builder/tasks/main.yaml

@@ -135,7 +135,7 @@
 
 - name: "Check that witness message is available in build logs"
   ansible.builtin.shell: |
-    kubectl exec nodepool-builder-0 -- bash -c "grep 'Hello from build of {{ nodepool_diskimage_name }}' /var/log/nodepool/builds/*"
+    kubectl exec nodepool-builder-0 -- bash -c "grep 'Hello from build of {{ nodepool_diskimage_name }}' /var/lib/nodepool/builds/logs/*"
   register: witness
   until: witness is success
   delay: 5

roles/post/get-k8s-resources/tasks/main.yaml

@@ -33,6 +33,7 @@
     - configmaps
     - jobs
     - pvc
+    - routes
     - csvs
     - installplans
     - sub

roles/post/get-nodepool-builds-logs/tasks/main.yaml

@@ -4,7 +4,7 @@
     path: "{{ output_dir }}"
     state: absent
 
-- name: "Fetch nodepool-builder /var/log/nodepool/builds content locally in {{ output_dir }}"
+- name: "Fetch nodepool-builder /var/lib/nodepool/builds/logs content locally in {{ output_dir }}"
   ansible.builtin.command: |
-    kubectl cp nodepool-builder-0:/var/log/nodepool/builds -c nodepool-builder {{ output_dir }}
+    kubectl cp nodepool-builder-0:/var/lib/nodepool/builds/logs -c nodepool-builder {{ output_dir }}
   failed_when: false