update supported arches for kn-workflow-cli-artifacts image (#36) (#58)

* update supported arches for kn-workflow-cli-artifacts image * set versions to 1.33.0 * fix indentation in images/osl-cli.yaml * fix LICENSE path in /tmp * add quiet to wget * fix zip command when creating windows zip * remove internal url from example
kiegroup · Jun 4, 2024 · 96e52cd · 96e52cd
1 parent e9873d1
commit 96e52cd
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 44 deletions.
diff --git a/images/modules/com.redhat.osl.cli.artifacts/install.sh b/images/modules/com.redhat.osl.cli.artifacts/install.sh
@@ -15,4 +15,4 @@
 
 set -e
 
-mkdir -p /usr/share/kn/{linux_amd64,linux_ppc64le,linux_s390x,macos,windows}
+mkdir -p /usr/share/kn/{linux_amd64,linux_arm64,macos_amd64,macos_arm64,windows}
diff --git a/images/modules/com.redhat.osl.cli.artifacts/module.yaml b/images/modules/com.redhat.osl.cli.artifacts/module.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 name: "com.redhat.osl.cli.artifacts"
-version: "1.33.0-snapshot"
+version: "1.33.0"
 description: "Copy binaries from the packager image"
 
 execute:
@@ -25,18 +25,18 @@ artifacts:
     path: /opt/app-root/src/go/src/github.com/knative/client/kn-workflow-linux-amd64.tar.gz
     dest: /usr/share/kn/linux_amd64/
   - image: packager
-    name: kn-workflow-linux-ppc64le
-    path: /opt/app-root/src/go/src/github.com/knative/client/kn-workflow-linux-ppc64le.tar.gz
-    dest: /usr/share/kn/linux_ppc64le/
+    name: kn-workflow-linux-arm64
+    path: /opt/app-root/src/go/src/github.com/knative/client/kn-workflow-linux-arm64.tar.gz
+    dest: /usr/share/kn/linux_arm64/
   - image: packager
-    name: kn-workflow-linux-s390x
-    path: /opt/app-root/src/go/src/github.com/knative/client/kn-workflow-linux-s390x.tar.gz
-    dest: /usr/share/kn/linux_s390x/
+    name: kn-workflow-windows-amd64
+    path: /opt/app-root/src/go/src/github.com/knative/client/kn-workflow-windows-amd64.zip
+    dest: /usr/share/kn/windows/
   - image: packager
     name: kn-workflow-macos-amd64
     path: /opt/app-root/src/go/src/github.com/knative/client/kn-workflow-macos-amd64.tar.gz
-    dest: /usr/share/kn/macos/
+    dest: /usr/share/kn/macos_amd64/
   - image: packager
-    name: kn-workflow-windows-amd64
-    path: /opt/app-root/src/go/src/github.com/knative/client/kn-workflow-windows-amd64.zip
-    dest: /usr/share/kn/windows/
+    name: kn-workflow-macos-arm64
+    path: /opt/app-root/src/go/src/github.com/knative/client/kn-workflow-macos-arm64.tar.gz
+    dest: /usr/share/kn/macos_arm64/
diff --git a/images/modules/com.redhat.osl.cli.packager/install.sh b/images/modules/com.redhat.osl.cli.packager/install.sh
@@ -18,19 +18,19 @@ set -e
 mkdir -p "${KN_WORK_DIR}"
 cd "${KN_WORK_DIR}"
 
-mv  "/tmp/LICENSE" .
+mv  "/tmp/artifacts/LICENSE" .
 
-wget -P "${KN_WORK_DIR}" "${KN_ARTIFACT_URL}/amd64/linux/kn-workflow-linux-amd64"
-wget -P "${KN_WORK_DIR}" "${KN_ARTIFACT_URL}/ppc64le/linux/kn-workflow-linux-ppc64le"
-wget -P "${KN_WORK_DIR}" "${KN_ARTIFACT_URL}/s390x/linux/kn-workflow-linux-s390x"
-wget -P "${KN_WORK_DIR}" "${KN_ARTIFACT_URL}/amd64/windows/kn-workflow-windows-amd64.exe"
-wget -P "${KN_WORK_DIR}" "${KN_ARTIFACT_URL}/amd64/macos/kn-workflow-darwin-amd64"
+wget -q -P "${KN_WORK_DIR}" "${KN_ARTIFACT_URL}/amd64/linux/kn-workflow-linux-amd64"
+wget -q -P "${KN_WORK_DIR}" "${KN_ARTIFACT_URL}/arm64/linux/kn-workflow-linux-arm64"
+wget -q -P "${KN_WORK_DIR}" "${KN_ARTIFACT_URL}/amd64/windows/kn-workflow-windows-amd64.exe"
+wget -q -P "${KN_WORK_DIR}" "${KN_ARTIFACT_URL}/amd64/macos/kn-workflow-darwin-amd64"
+wget -q -P "${KN_WORK_DIR}" "${KN_ARTIFACT_URL}/arm64/macos/kn-workflow-darwin-arm64"
 
-chmod +x kn-workflow-linux-amd64 kn-workflow-linux-ppc64le kn-workflow-linux-s390x kn-workflow-windows-amd64.exe kn-workflow-darwin-amd64
+chmod +x kn-workflow-linux-amd64 kn-workflow-linux-arm64 kn-workflow-windows-amd64.exe kn-workflow-darwin-amd64 kn-workflow-darwin-arm64
 
 tar --transform='flags=r;s|kn-workflow-linux-amd64|kn|' -zcf kn-workflow-linux-amd64.tar.gz kn-workflow-linux-amd64 LICENSE
-tar --transform='flags=r;s|kn-workflow-linux-ppc64le|kn|' -zcf kn-workflow-linux-ppc64le.tar.gz kn-workflow-linux-ppc64le LICENSE
-tar --transform='flags=r;s|kn-workflow-linux-s390x|kn|' -zcf kn-workflow-linux-s390x.tar.gz kn-workflow-linux-s390x LICENSE
+tar --transform='flags=r;s|kn-workflow-linux-arm64|kn|' -zcf kn-workflow-linux-arm64.tar.gz kn-workflow-linux-arm64 LICENSE
 tar --transform='flags=r;s|kn-workflow-darwin-amd64|kn|' -zcf kn-workflow-macos-amd64.tar.gz kn-workflow-darwin-amd64 LICENSE
+tar --transform='flags=r;s|kn-workflow-darwin-arm64|kn|' -zcf kn-workflow-macos-arm64.tar.gz kn-workflow-darwin-arm64 LICENSE
 
-mkdir "${KN_WORK_DIR}/windows" && mv kn-workflow-windows-amd64.exe "${KN_WORK_DIR}/windows/kn.exe" && cp LICENSE "${KN_WORK_DIR}/windows/" && zip --quiet --junk-path - "${KN_WORK_DIR}/windows/*" > kn-workflow-windows-amd64.zip
+mkdir "${KN_WORK_DIR}/windows" && mv kn-workflow-windows-amd64.exe "${KN_WORK_DIR}/windows/kn.exe" && cp LICENSE "${KN_WORK_DIR}/windows/" && zip -jrq kn-workflow-windows-amd64.zip "${KN_WORK_DIR}/windows"
diff --git a/images/modules/com.redhat.osl.cli.packager/module.yaml b/images/modules/com.redhat.osl.cli.packager/module.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 name: "com.redhat.osl.cli.packager"
-version: "1.33.0-snapshot"
+version: "1.33.0"
 description: "Download kn-workflow cli binaries from a given repository"
 
 packages:
@@ -30,7 +30,6 @@ envs:
 args:
   - name: KN_ARTIFACT_URL
     description: "Base URL from where to download the artifacts"
-    example: "http://download.eng.bos.redhat.com/staging-cds/etera/openshift-serverless-clients/1/1.11/1.11.2-4/signed"
 artifacts:
   - name: LICENSE
     url: "https://raw.githubusercontent.com/kiegroup/kogito-serverless-operator/main/LICENSE"

diff --git a/images/osl-cli.yaml b/images/osl-cli.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 - name: "packager"
-  version: 1.33.0-snapshot
+  version: "1.33.0"
   from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
   modules:
     repositories:
@@ -22,7 +22,7 @@
       - name: com.redhat.osl.cli.packager
 
 - name: "openshift-serverless-1/logic-kn-workflow-cli-artifacts-rhel8"
-  version: 1.33.0-snapshot
+  version: "1.33.0"
   description: "Red Hat OpenShift Serverless Logic 1 kn-workflow CLI artifacts"
   from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
   labels:
@@ -31,7 +31,7 @@
     - name: name
       value: "openshift-serverless-1/kn-workflow-cli-artifacts-rhel8"
     - name: version
-      value: "1.33.0-snapshot"
+      value: "1.33.0"
     - name: summary
       value: "Red Hat OpenShift Serverless Logic 1 kn-workflow CLI artifacts"
     - name: description
@@ -51,21 +51,20 @@
       - name: com.redhat.osl.cli.artifacts
   run:
     user: 65532
-
-packages:
-  manager: microdnf
-  content_sets_file: content_sets.yaml
 
-osbs:
-  configuration:
-    container:
-      platforms:
-        only:
-        - x86_64
-        - aarch64
-        - ppc64le
-      compose:
-        pulp_repos: true
-  repository:
-    name: containers/openshift-serverless-1-logic-kn-workflow-cli-artifacts
-    branch: openshift-serverless-1.33-rhel-8    
+  packages:
+    manager: microdnf
+    content_sets_file: content_sets.yaml
+
+  osbs:
+    configuration:
+      container:
+        platforms:
+          only:
+          - x86_64
+          - aarch64
+        compose:
+          pulp_repos: true
+    repository:
+      name: containers/openshift-serverless-1-logic-kn-workflow-cli-artifacts
+      branch: openshift-serverless-1.33-rhel-8
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,4 @@

		set -e

		mkdir -p /usr/share/kn/{linux_amd64,linux_ppc64le,linux_s390x,macos,windows}
		mkdir -p /usr/share/kn/{linux_amd64,linux_arm64,macos_amd64,macos_arm64,windows}