update 2.8.x with release fixes (#9787)

cherry picks most recent release changes to 2.8.x for a smoother 2.8.5 release process.
pachyderm · Feb 29, 2024 · 3823ba0 · 3823ba0
1 parent 45b4f1c
commit 3823ba0
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 22 deletions.
diff --git a/.circleci/main.yml b/.circleci/main.yml
@@ -1391,8 +1391,8 @@ jobs:
               fi
             git clone https://github.com/pachyderm/haberdashery.git haberdashery
             cd haberdashery
-            git fetch --all
-            git checkout -b release-${CIRCLE_TAG:1} ${parentBranch}
+            git fetch origin
+            git checkout -b release-${CIRCLE_TAG:1} origin/${parentBranch}
             tmp=$(mktemp)
             jq --arg val "${CIRCLE_TAG:1}-${CIRCLE_SHA1}" '.pachyderm = $val' version.json > "$tmp" && mv "$tmp" version.json
             jq --arg val "${CIRCLE_SHA1}" '.pachReleaseCommit = $val' version.json > "$tmp" && mv "$tmp" version.json
@@ -1401,13 +1401,9 @@ jobs:
             git commit -m "bump pachyderm version"
             git push origin release-${CIRCLE_TAG:1}
             PR=$(gh pr create --base ${parentBranch} --title "bump pach version for release ${CIRCLE_TAG:1}" --body "bump pach version" --reviewer pachydermbuildbot --repo pachyderm/haberdashery)
+            sleep 10 # give it a bit time for checks to attach
             gh pr checks ${PR} --watch --interval 10 --repo pachyderm/haberdashery
-            PR_STATE=$(gh pr status --json mergeStateStatus --jq .currentBranch.mergeStateStatus --repo pachyderm/haberdashery)
-            if [[ "$PR_STATE" != "CLEAN" ]]; then
-              echo "review console PR ${PR} for failures. PR Checks failed."
-              exit 1
-            fi
-            gh pr merge ${PR} --admin --repo pachyderm/haberdashery
+            gh pr merge ${PR} --rebase --admin --repo pachyderm/haberdashery
             sleep 2 # give it quick sec to merge, make sure we get right state.
             IS_MERGED=$(gh pr view ${PR} --json state --jq .state --repo pachyderm/haberdashery)
             if [[ "${IS_MERGED}" != "MERGED" ]]; then
@@ -1418,16 +1414,16 @@ jobs:
             if [[ $CIRCLE_TAG == *"-"* ]];
               then
                   echo "git tag has - assuming prerelease."
-                  gh release create --draft ${CIRCLE_TAG:1}-1 --tittle ${CIRCLE_TAG:1}-1 --target $parentBranch --generate-notes --prerelease --repo pachyderm/haberdashery
+                  gh release create --draft ${CIRCLE_TAG:1} --title ${CIRCLE_TAG:1} --target $parentBranch --generate-notes --prerelease --repo pachyderm/haberdashery
               else
                   echo "regular release."
-                  gh release create --draft ${CIRCLE_TAG:1}-1 --tittle ${CIRCLE_TAG:1}-1 --target $parentBranch --generate-notes --repo pachyderm/haberdashery
+                  gh release create --draft ${CIRCLE_TAG:1} --title ${CIRCLE_TAG:1} --target $parentBranch --generate-notes --repo pachyderm/haberdashery
               fi
             SECONDS=0
             while :; do
-                docker pull pachyderm/haberdashery:${CIRCLE_TAG:1}-1 2>/dev/null && break
-                if (( $SECONDS > 1 )); then
-                    printf 'Waited 10 minutes for console docker image, inspect console relase at https://app.circleci.com/pipelines/gh/pachyderm/haberdashery for failures\n' >&2
+                docker pull pachyderm/haberdashery:${CIRCLE_TAG:1} 2>/dev/null && break
+                if (( $SECONDS > 600 )); then
+                    printf 'Waited 10 minutes for console docker image to appear in the registry, inspect console relase at https://app.circleci.com/pipelines/gh/pachyderm/haberdashery for failures or delays\n' >&2
                     exit 1
                 fi
                 sleep 1
@@ -2125,7 +2121,7 @@ workflows:
       - release-github:
           name: github-release-console
           repo: pachyderm/haberdashery
-          tag: ${CIRCLE_TAG:1}-1
+          tag: ${CIRCLE_TAG:1}
           filters: *only-release-tags
           requires:
             - sign-off

diff --git a/etc/build/update_homebrew.sh b/etc/build/update_homebrew.sh
@@ -7,10 +7,6 @@ stable=$2
 
 echo "--- Updating homebrew formula to use binaries at version $version"
 BRANCH=master
-if [[ $stable == 0 ]];
-then
-    BRANCH=$version
-fi;
 
 MAJOR_MINOR=$(echo "$version" | cut -f -2 -d ".")
 
@@ -42,7 +38,7 @@ pushd homebrew-tap
     if [[ $stable == 1 ]]; then
 	if [[ "${major}.${minor}" == "$MAJOR_MINOR" ]]; then 
             cp "pachctl@$MAJOR_MINOR.rb" pachctl.rb
-            sed -i -E 's/class PachctlAT\([0-9]*\)/class Pachctl/g' pachctl.rb
+            sed -i 's/class PachctlAT\([0-9]*\)/class Pachctl/g' pachctl.rb
             git add pachctl.rb
 	fi;
     fi;

diff --git a/etc/helm/pachyderm/templates/console/deployment.yaml b/etc/helm/pachyderm/templates/console/deployment.yaml
@@ -38,7 +38,7 @@ spec:
       {{- end }}
 {{- include "pachyderm.imagePullSecrets" . | indent 6 }}
       containers:
-      - image: "{{ .Values.global.image.registry }}{{ .Values.console.image.repository }}:{{ .Values.console.image.tag }}"
+      - image: "{{ .Values.global.image.registry }}{{ .Values.console.image.repository }}:{{ default .Chart.AppVersion .Values.console.image.tag }}"
         imagePullPolicy: {{ .Values.console.image.pullPolicy }}
         name: console
         livenessProbe:

diff --git a/etc/helm/pachyderm/values.yaml b/etc/helm/pachyderm/values.yaml
@@ -389,7 +389,8 @@ console:
     pullPolicy: "IfNotPresent"
     # tag is the image repo to pull from; together with repository it
     # replicates the --console-image argument to pachctl deploy.
-    tag: "2.8.4"
+    # defaults to .Chart.AppVersion
+    tag: ""
   priorityClassName: ""
   nodeSelector: {}
   tolerations: []

diff --git a/etc/testing/circle/workloads/pulumi/aws/Pulumi.qa1.yaml b/etc/testing/circle/workloads/pulumi/aws/Pulumi.qa1.yaml
@@ -3,3 +3,6 @@ config:
   core:eksNodeInstanceType: m5.2xlarge
   core:pgBouncerDefaultPoolSize: "100"
   core:pgBouncerMaxConnections: "1500"
+  core:desiredClusterSize: 4
+  core:maxClusterSize: 5
+  core:minClusterSize: 3
diff --git a/etc/testing/circle/workloads/pulumi/aws/app.go b/etc/testing/circle/workloads/pulumi/aws/app.go
@@ -183,7 +183,9 @@ func DeployApp(ctx *pulumi.Context, k8sProvider *kubernetes.Provider, saRole *ia
 		},
 		"pachd": pulumi.Map{
 			"localhostIssuer": pulumi.String("true"),
-			"logLevel":        pulumi.String("debug"),
+			"logLevel":        pulumi.String("info"),
+			"lokiDeploy":      pulumi.Bool(false),
+			"lokiLogging":     pulumi.Bool(false),
 			"image": pulumi.Map{
 				"tag": pulumi.String(pachdImageTag),
 			},