From 53d60bd136fd179a3cceea1d38a08f2bc59adbce Mon Sep 17 00:00:00 2001 From: Yevgeny Shnaidman <60741237+yevgeny-shnaidman@users.noreply.github.com> Date: Mon, 10 Aug 2020 10:49:59 +0300 Subject: [PATCH] MGMT-1764 - rename ignition job to assisted-ignition-generator (#22) --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- ...rate => Dockerfile.assisted-ignition-generator | 0 Makefile | 6 +++--- README.md | 10 +++++----- ...ocess-ignition-manifests-and-kubeconfig1.stats | Bin 720 -> 0 bytes 6 files changed, 12 insertions(+), 12 deletions(-) rename Dockerfile.ignition-manifests-and-kubeconfig-generate => Dockerfile.assisted-ignition-generator (100%) delete mode 100644 reports/process-ignition-manifests-and-kubeconfig1.stats diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a32220c..a59679b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,10 +35,10 @@ jobs: if: github.event_name != 'pull_request' uses: elgohr/Publish-Docker-Github-Action@2.15 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 }}" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c175438..9eebee3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,10 +33,10 @@ jobs: - name: Publish image to Registry uses: elgohr/Publish-Docker-Github-Action@2.15 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 }}" diff --git a/Dockerfile.ignition-manifests-and-kubeconfig-generate b/Dockerfile.assisted-ignition-generator similarity index 100% rename from Dockerfile.ignition-manifests-and-kubeconfig-generate rename to Dockerfile.assisted-ignition-generator diff --git a/Makefile b/Makefile index ea20e00..41df82a 100644 --- a/Makefile +++ b/Makefile @@ -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: diff --git a/README.md b/README.md index 9a7ff64..d0193c9 100644 --- a/README.md +++ b/README.md @@ -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 @@ -17,7 +17,7 @@ Building: docker build -f Dockerfile.installer-image -t . 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: @@ -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 diff --git a/reports/process-ignition-manifests-and-kubeconfig1.stats b/reports/process-ignition-manifests-and-kubeconfig1.stats deleted file mode 100644 index 4fb324a26ec30ec692e8b7429e36c3334ddd6d43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmZWn&2H2%5DrT>-L?xVRH(i8QV!{*FTkybJOPI)a_mWB)jN*-v#^IsJb)!QxL4i= z-iJ3}oNW>#Mz&N1Y`EmWy2g(6!SLZNs&zr!dl{%DJcqM8z3s%Uvspx!+%ye0pkrVBDtYgj%?#xsgEt#5yiE7J?WHqgcI=&lm64RuVIw)nP_4}n{ z;c_e;#8s)0ti2-|GR>pVd?+Q)W*0sj#OE3Ee-YCl?+*}@4{HHEpaA5O){$<^ver)D z#qaT^d;KF^q(80=+`?B5eKOv@#S9}W~xF>;_p9Qhd)2>e((J4 EU&0g&TL1t6