From 9e23687bc8bbd708510347843e4e40bb7f595b7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Mudrini=C4=87?= <mudrinic.mare@gmail.com>
Date: Fri, 26 May 2023 23:06:19 +0200
Subject: [PATCH] Add krel obs stage to krel stage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
---
 gcb/stage/cloudbuild.yaml | 39 ++++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/gcb/stage/cloudbuild.yaml b/gcb/stage/cloudbuild.yaml
index c84d867fdef4..bf91759d34ef 100644
--- a/gcb/stage/cloudbuild.yaml
+++ b/gcb/stage/cloudbuild.yaml
@@ -31,10 +31,13 @@ timeout: 14400s
 #
 # (Please do not remove this security notice.)
 secrets:
-- kmsKeyName: projects/k8s-releng-prod/locations/global/keyRings/release/cryptoKeys/encrypt-0
+# - kmsKeyName: projects/k8s-releng-prod/locations/global/keyRings/release/cryptoKeys/encrypt-0
+#   secretEnv:
+#     GITHUB_TOKEN: CiQAIkWjMHZABAFJqEFQir1WipsO3rAGkhw1pwhp1er/m3px/kESUQBLz1D+hzzlrovRVuetP+sCqzjfKZl/iB0aiQIT36imOk8j7laYDZjprxGGQQQiUVaqYvstroJH3D53f4JKQHzXUvWziSSnhH3HFZz++RT/yQ==
+#     DOCKERHUB_TOKEN: CiQAIkWjMJDKU6Hu3pJIBf31dIl7xJQQEiccN7k1cCzGadGoT2gSTQBLz1D+uc9PMusYnFvXtJi25OqEUktDJs28d09jDyj9gcyTx9iX/JvOE3Dn2qnhrjwrUMk5bBhFjR7dHCr4mJgEVD5dXrd6yLGbDBu2
+- kmsKeyName: projects/k8s-releng-prod/locations/global/keyRings/release/cryptoKeys/obs
   secretEnv:
-    GITHUB_TOKEN: CiQAIkWjMHZABAFJqEFQir1WipsO3rAGkhw1pwhp1er/m3px/kESUQBLz1D+hzzlrovRVuetP+sCqzjfKZl/iB0aiQIT36imOk8j7laYDZjprxGGQQQiUVaqYvstroJH3D53f4JKQHzXUvWziSSnhH3HFZz++RT/yQ==
-    DOCKERHUB_TOKEN: CiQAIkWjMJDKU6Hu3pJIBf31dIl7xJQQEiccN7k1cCzGadGoT2gSTQBLz1D+uc9PMusYnFvXtJi25OqEUktDJs28d09jDyj9gcyTx9iX/JvOE3Dn2qnhrjwrUMk5bBhFjR7dHCr4mJgEVD5dXrd6yLGbDBu2
+    OBS_PASSWORD: CiQAXrrgPTLzLId8sRADEJYdBeOCBv7djdomvYV/9cdEbNKUBrMSPAA2Zz9jrArtxsYUKk1if2nZE6w0wPosrAKDpko8c/WErfYajTQ/yF88gZd3DdllDHmYzTqHCA0eLbie9A==
 
 steps:
 - name: gcr.io/cloud-builders/git
@@ -62,6 +65,30 @@ steps:
   - "./compile-release-tools"
   - "krel"
 
+# - name: gcr.io/k8s-staging-releng/k8s-cloud-builder:${_KUBE_CROSS_VERSION}
+#   dir: "/workspace"
+#   env:
+#   - "TOOL_ORG=${_TOOL_ORG}"
+#   - "TOOL_REPO=${_TOOL_REPO}"
+#   - "TOOL_REF=${_TOOL_REF}"
+#   - "BUILD_ID=${BUILD_ID}"
+#   - "K8S_ORG=${_K8S_ORG}"
+#   - "K8S_REPO=${_K8S_REPO}"
+#   - "K8S_REF=${_K8S_REF}"
+#   - GOOGLE_SERVICE_ACCOUNT_NAME=krel-staging@k8s-releng-prod.iam.gserviceaccount.com
+#   secretEnv:
+#   - GITHUB_TOKEN
+#   - DOCKERHUB_TOKEN
+#   args:
+#   - "bin/krel"
+#   - "stage"
+#   - "--submit=false"
+#   - "${_NOMOCK}"
+#   - "--log-level=${_LOG_LEVEL}"
+#   - "--type=${_TYPE}"
+#   - "--branch=${_RELEASE_BRANCH}"
+#   - "--build-version=${_BUILDVERSION}"
+
 - name: gcr.io/k8s-staging-releng/k8s-cloud-builder:${_KUBE_CROSS_VERSION}
   dir: "/workspace"
   env:
@@ -72,14 +99,12 @@ steps:
   - "K8S_ORG=${_K8S_ORG}"
   - "K8S_REPO=${_K8S_REPO}"
   - "K8S_REF=${_K8S_REF}"
-  - GOOGLE_SERVICE_ACCOUNT_NAME=krel-staging@k8s-releng-prod.iam.gserviceaccount.com
   secretEnv:
-  - GITHUB_TOKEN
-  - DOCKERHUB_TOKEN
+  - OBS_PASSWORD
   args:
   - "bin/krel"
+  - "obs"
   - "stage"
-  - "--submit=false"
   - "${_NOMOCK}"
   - "--log-level=${_LOG_LEVEL}"
   - "--type=${_TYPE}"