Skip to content

Commit

Permalink
Move to rhpds GitHub and quay.io orgs (#125)
Browse files Browse the repository at this point in the history
- Update references for GitHub redhat-cop to rhpds
- Update references for quay.io redhat-cop to rhpds
  • Loading branch information
jkupferer authored Feb 5, 2025
1 parent 97f7fbe commit c091bcb
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 669 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ on:
- 'v[0-9]*'
jobs:
publish:
env:
IMAGE_NAME: poolboy
runs-on: ubuntu-latest
steps:
- name: Checkout source
Expand Down Expand Up @@ -45,9 +43,9 @@ jobs:
if: steps.image_tags.outputs.IMAGE_TAGS
uses: redhat-actions/buildah-build@v2
with:
image: ${{ env.IMAGE_NAME }}
image: ${{ vars.IMAGE_NAME }}
tags: ${{ steps.image_tags.outputs.IMAGE_TAGS }}
containerfiles: Dockerfile
containerfiles: Containerfile

- name: Push image to registry
id: push-to-registry
Expand All @@ -57,8 +55,8 @@ jobs:
image: ${{ steps.buildah-build.outputs.image }}
tags: ${{ steps.buildah-build.outputs.tags }}
registry: ${{ vars.IMAGE_REGISTRY }}/${{ vars.IMAGE_REPOSITORY }}
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}
username: ${{ secrets.IMAGE_REGISTRY_USERNAME }}
password: ${{ secrets.IMAGE_REGISTRY_PASSWORD }}

publish-helm-charts:
needs: publish
Expand Down
15 changes: 7 additions & 8 deletions .github/workflows/pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@ jobs:
#- name: Static tests
# run: |

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Build example from s2i image
uses: docker/build-push-action@v2
- name: Buildah Action
id: buildah-build
if: steps.image_tags.outputs.IMAGE_TAGS
uses: redhat-actions/buildah-build@v2
with:
push: false
repository: poolboy
tags: ${{ github.sha }}
image: ${{ vars.IMAGE_NAME }}
tags: latest
containerfiles: Containerfile

#- name: Test image
# run: |
File renamed without changes.
81 changes: 6 additions & 75 deletions build-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,16 @@ apiVersion: template.openshift.io/v1
kind: Template
metadata:
annotations:
description: poolboy deploy
description: poolboy build config and imagestrem
name: poolboy-build

parameters:
- name: NAME
value: poolboy
- name: GIT_REPO
value: https://github.com/redhat-cop/poolboy.git
value: https://github.com/rhpds/poolboy.git
- name: GIT_REF
value: main
- name: KOPF_S2I_IMAGE
value: quay.io/redhat-cop/python-kopf-s2i:v1.37
- name: PYTHON_S2I_IMAGE
value: registry.access.redhat.com/ubi8/python-38:latest

objects:
- apiVersion: image.openshift.io/v1
Expand Down Expand Up @@ -44,11 +40,9 @@ objects:
uri: ${GIT_REPO}
ref: ${GIT_REF}
strategy:
type: Source
sourceStrategy:
from:
kind: DockerImage
name: ${KOPF_S2I_IMAGE}
type: Docker
dockerStrategy:
dockerfilePath: Containerfile
triggers: []

- apiVersion: image.openshift.io/v1
Expand Down Expand Up @@ -81,67 +75,4 @@ objects:
dockerStrategy:
forcePull: true
triggers: []

#- apiVersion: image.openshift.io/v1
# kind: ImageStream
# metadata:
# name: ${NAME}-admin-api
# spec:
# lookupPolicy:
# local: false
#
#- apiVersion: v1
# kind: BuildConfig
# metadata:
# name: ${NAME}-admin-api
# spec:
# output:
# to:
# kind: ImageStreamTag
# name: ${NAME}-admin-api:latest
# postCommit: {}
# resources: {}
# runPolicy: Serial
# source:
# contextDir: admin-api
# git:
# uri: ${GIT_REPO}
# ref: ${GIT_REF}
# strategy:
# type: Source
# sourceStrategy:
# from:
# kind: DockerImage
# name: ${PYTHON_S2I_IMAGE}
# triggers: []
#
#- apiVersion: image.openshift.io/v1
# kind: ImageStream
# metadata:
# name: ${NAME}-admin-ui
# spec:
# lookupPolicy:
# local: false
#
#- apiVersion: v1
# kind: BuildConfig
# metadata:
# name: ${NAME}-admin-ui
# spec:
# output:
# to:
# kind: ImageStreamTag
# name: ${NAME}-admin-ui:latest
# postCommit: {}
# resources: {}
# runPolicy: Serial
# source:
# contextDir: admin-ui
# git:
# uri: ${GIT_REPO}
# ref: ${GIT_REF}
# strategy:
# type: Docker
# dockerStrategy:
# forcePull: true
# triggers: []
...
Loading

0 comments on commit c091bcb

Please sign in to comment.