Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build and push the dev oci-catalog image. #6594

Merged
merged 4 commits into from
Aug 10, 2023
Merged

Conversation

absoludity
Copy link
Contributor

Description of the change

While setting up the dev chart changes, just realised I hadn't yet updated to publish the dev image.

Benefits

Dev image for oci-catalog will be available.

Applicable issues

Additional information

@netlify
Copy link

netlify bot commented Aug 9, 2023

Deploy Preview for kubeapps-dev failed.

Name Link
🔨 Latest commit 0f552a1
🔍 Latest deploy log https://app.netlify.com/sites/kubeapps-dev/deploys/64d31f9aca981500084b5353

@netlify
Copy link

netlify bot commented Aug 9, 2023

Deploy Preview for kubeapps-dev canceled.

Name Link
🔨 Latest commit 3f6f4c3
🔍 Latest deploy log https://app.netlify.com/sites/kubeapps-dev/deploys/64d4346a6f320d0008bee4cd

@antgamdia
Copy link
Contributor

Happy to see this PR. In fact, I had some stashed changes doing the same (I did it while upgrading versions), and forgot to ask you what to do with this new component. Find below my changes, just in case they can be of help.

Full diff
diff --git a/.github/workflows/kubeapps-general.yaml b/.github/workflows/kubeapps-general.yaml
index 3dd0d5fdb..aff6192d2 100644
--- a/.github/workflows/kubeapps-general.yaml
+++ b/.github/workflows/kubeapps-general.yaml
@@ -39,7 +39,7 @@ env:
   HELM_VERSION_MIN: "v3.8.0"
   HELM_VERSION_STABLE: "v3.12.2"
   GITHUB_VERSION: "2.32.1"
-  IMAGES_TO_PUSH: "apprepository-controller dashboard asset-syncer pinniped-proxy kubeapps-apis"
+  IMAGES_TO_PUSH: "apprepository-controller dashboard asset-syncer pinniped-proxy oci-catalog kubeapps-apis"
   # IMG_DEV_TAG is the tags used for the Kubeapps docker images. Ideally there should be an IMG_PROD_TAG
   # but its value is dynamic and GitHub actions doesn't support it in the `env` block, so it is generated
   # as an output of the `setup` job.
@@ -225,6 +225,17 @@ jobs:
       - name: Run rust unit tests
         run: cargo test --manifest-path cmd/pinniped-proxy/Cargo.toml
 
+  test_oci_catalog:
+    needs:
+      - setup
+    runs-on: ubuntu-latest
+    container:
+      image: rust:${{needs.setup.outputs.rust_version}}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run rust unit tests
+        run: cargo test --manifest-path cmd/oci-catalog/Cargo.toml
+
   test_chart_render:
     needs:
       - setup
@@ -256,6 +267,7 @@ jobs:
           - asset-syncer
           - kubeapps-apis
           - pinniped-proxy
+          - oci-catalog
     steps:
       - id: setup
         run: |
@@ -408,6 +420,7 @@ jobs:
       - test_go
       - test_dashboard
       - test_pinniped_proxy
+      - test_oci_catalog
       - test_chart_render
       - build_docker_images
       - build_dashboard_image
@@ -730,6 +743,7 @@ jobs:
       - test_go
       - test_dashboard
       - test_pinniped_proxy
+      - test_oci_catalog
       - test_chart_render
       - build_docker_images
       - build_dashboard_image

@antgamdia
Copy link
Contributor

I have just noticed we would also need to get some scripts updated, for instance, script/chart_sync_utils.sh and script/e2e-test.sh

Signed-off-by: Michael Nelson <minelson@vmware.com>
Signed-off-by: Michael Nelson <minelson@vmware.com>
@absoludity absoludity force-pushed the publish-dev-oci-catalog branch from 0f552a1 to 4b87fc9 Compare August 9, 2023 23:44
@absoludity
Copy link
Contributor Author

I have just noticed we would also need to get some scripts updated, for instance, script/chart_sync_utils.sh and script/e2e-test.sh

True - fixed. Thanks Antonio.

Signed-off-by: Michael Nelson <minelson@vmware.com>
@absoludity absoludity force-pushed the publish-dev-oci-catalog branch 4 times, most recently from 95d930a to 2d3dfcf Compare August 10, 2023 00:47
Signed-off-by: Michael Nelson <minelson@vmware.com>
@absoludity absoludity force-pushed the publish-dev-oci-catalog branch from 2d3dfcf to 3f6f4c3 Compare August 10, 2023 00:50
@absoludity
Copy link
Contributor Author

After some fiddling, it turns out the ubuntu-latest image that we use, is actually configured with debian sources?? Anyway, managed to ensure protoc is installed.

Screenshot 2023-08-10 at 10 51 43 am

@absoludity absoludity merged commit 9755e94 into main Aug 10, 2023
@absoludity absoludity deleted the publish-dev-oci-catalog branch August 10, 2023 01:21
@antgamdia
Copy link
Contributor

Thanks for the changes! I have just updated how it looks in Dockerhub:

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants