Skip to content
This repository has been archived by the owner on Oct 19, 2020. It is now read-only.

Commit

Permalink
MGMT-1764 - rename ignition job to assisted-ignition-generator (#22)
Browse files Browse the repository at this point in the history
  • Loading branch information
yevgeny-shnaidman authored Aug 10, 2020
1 parent e90f208 commit 53d60bd
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ jobs:
if: github.event_name != 'pull_request'
uses: elgohr/[email protected]
with:
name: ignition-manifests-and-kubeconfig-generate
name: assisted-ignition-generator
username: ${{ secrets.OCPMETAL_USERNAME }}
password: ${{ secrets.OCPMETAL_PASSWORD }}
REGISTRY: 'quay.io/ocpmetal'
dockerfile: Dockerfile.ignition-manifests-and-kubeconfig-generate
dockerfile: Dockerfile.assisted-ignition-generator
buildargs: GIT_REVISION
tags: "latest,${{ env.GIT_REVISION }}"
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:
- name: Publish image to Registry
uses: elgohr/[email protected]
with:
name: ignition-manifests-and-kubeconfig-generate
name: assisted-ignition-generator
username: ${{ secrets.OCPMETAL_USERNAME }}
password: ${{ secrets.OCPMETAL_PASSWORD }}
REGISTRY: 'quay.io/ocpmetal'
dockerfile: Dockerfile.ignition-manifests-and-kubeconfig-generate
dockerfile: assisted-ignition-generator
buildargs: GIT_REVISION
tags: "${{ env.GIT_TAG }},${{ env.GIT_REVISION }}"
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
SERVICE := $(or ${SERVICE},quay.io/ocpmetal/ignition-manifests-and-kubeconfig-generate:latest)
SERVICE := $(or ${SERVICE},quay.io/ocpmetal/assisted-ignition-generator:latest)


all: pep8 pylint build

build:
skipper build ignition-manifests-and-kubeconfig-generate
skipper build assisted-ignition-generator

update: build
GIT_REVISION=${GIT_REVISION} docker build --pull --build-arg GIT_REVISION -t $(SERVICE) -f Dockerfile.ignition-manifests-and-kubeconfig-generate .
GIT_REVISION=${GIT_REVISION} docker build --pull --build-arg GIT_REVISION -t $(SERVICE) -f Dockerfile.assisted-ignition-generator .
docker push $(SERVICE)

.DEFAULT:
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
### This is a image for generating ignition manifests & kubeconfig

1) Dockerfile (depricated) - dockerfile for building the ignition-manifests-and-kubeconfig-generate image with openshift-installer platform none
2) Dockerfile.baremetal - dockerfile for building the ignition-manifests-and-kubeconfig-generate image with openshift-installer platform baremetal
1) Dockerfile (depricated) - dockerfile for building the assisted-ignition-generator image with openshift-installer platform none
2) Dockerfile.baremetal - dockerfile for building the assisted-ignition-generator image with openshift-installer platform baremetal
3) installer_dir/install-config.yaml - example of install-config.yaml for none platform
4) installer_dir/install-config.yaml.baremetal - example of install-config.yaml for baremetal platform.
5) openshift-install - executable that produces ignition files. It is copied from installer repository before issuing docker build command. Should be build in accordance with the platform we are running on
Expand All @@ -17,7 +17,7 @@ Building:
docker build -f Dockerfile.installer-image -t <repository> .
Example: docker build -f Dockerfile.installer-image -t quay.io/yshnaidm/openshift-installer:latest .
2) we are using the image built in step 1 to get the needed openshift-install. Once we start using openshift-install from the release, we can update Dockerfile.baremetal accordingly
docker build -f Dockerfile.baremetal . -t quay.io/ocpmetal/ignition-manifests-and-kubeconfig-generate:stable
docker build -f Dockerfile.baremetal . -t quay.io/ocpmetal/assisted-ignition-generator:stable


Testing:
Expand All @@ -26,9 +26,9 @@ Testing can be done in 2 stages:

1) test generation of the ignition files , locally on your laptop.
a) copy install-config.yaml.baremetal to installer-config.yaml in installer_dir.
b) run ignition-manifests-and-kubeconfig-generate immage that you previously created.
b) run assisted-ignition-generator immage that you previously created.

docker run -v $(pwd)/installer_dir:/data/installer_dir -it ignition-manifests-and-kubeconfig-generate:ad6939c67c115cef7877ab7d06d72f2d06cebe0
docker run -v $(pwd)/installer_dir:/data/installer_dir -it assisted-ignition-generator:ad6939c67c115cef7877ab7d06d72f2d06cebe0

if no error is printed, then the ignition files are generated in the nstaller_dir

Expand Down
Binary file not shown.

0 comments on commit 53d60bd

Please sign in to comment.