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

[#27] Support ImageStream #132

Closed
wants to merge 1 commit into from

Conversation

jmesnil
Copy link
Member

@jmesnil jmesnil commented Jan 15, 2020

  • add Spec.ApplicationSourceSpec to build the application image from a
    Git repository using WildFly S2I
  • add Spec.BuildEnv to pass environment variables to the S2I build
  • make Spec.ApplicationImage optional as the definition of
    SourceRepositorySpec allows an alternative
  • Create ImageStream and BuildConfig resources to handle S2I builds
  • Use image.openshift.io/triggers annotation to trigger statefulset
    update when the image stream changes
  • add S2I_BUILDER_IMAGE and S2I_RUNTIME_IMAGE env vars to Dockerfile to
  • specify which S2I images is used by the operator

This fixes #27

@jmesnil jmesnil added Basic Install (I) Features for Phase I of the Operator capability levels Seamless Upgrades (II) Features for Phase II of the Operator capability levels OpenShift Extra features specific to OpenShift labels Jan 15, 2020
@jmesnil jmesnil added this to the 0.4.0 milestone Jan 15, 2020
@jmesnil jmesnil added this to In progress in WildFly Operator via automation Jan 15, 2020
@jmesnil
Copy link
Member Author

jmesnil commented Jan 15, 2020

this supersedes #130

@jmesnil jmesnil force-pushed the 27_imageStream_runtime branch 2 times, most recently from 1b28733 to baa5123 Compare January 23, 2020 10:01
deploy/operator.yaml Outdated Show resolved Hide resolved
@jmesnil jmesnil added the hold Do not merge this PR label Mar 6, 2020
pkg/controller/wildflyserver/wildflyserver_controller.go Outdated Show resolved Hide resolved
pkg/resources/imagestreams/imagestream.go Outdated Show resolved Hide resolved

incremental := true

builderImage := w.Spec.ApplicationSource.Source2Image.BuilderImage
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it could be useful if the Operator is able to check if the image does not exist yet and print a log in case. Someone could forget to import the image streams and do not understand why, if the CRD was deployed, the application is not build by the operator. The documentation states the images must be available though, so this is just a suggestion

doc/user-guide.adoc Outdated Show resolved Hide resolved
deploy/crds/quickstart.yaml Outdated Show resolved Hide resolved
doc/user-guide.adoc Outdated Show resolved Hide resolved
deploy/operator.yaml Outdated Show resolved Hide resolved
doc/user-guide.adoc Outdated Show resolved Hide resolved
@jmesnil jmesnil removed the hold Do not merge this PR label Apr 7, 2020
@jmesnil jmesnil force-pushed the 27_imageStream_runtime branch 3 times, most recently from 911048d to 464d321 Compare April 7, 2020 12:47
doc/user-guide.adoc Outdated Show resolved Hide resolved
doc/user-guide.adoc Outdated Show resolved Hide resolved
doc/user-guide.adoc Outdated Show resolved Hide resolved
doc/user-guide.adoc Outdated Show resolved Hide resolved
doc/user-guide.adoc Outdated Show resolved Hide resolved
doc/user-guide.adoc Outdated Show resolved Hide resolved
Add Spec.ApplicationSourceSpec to build the application image from a
Git repository using WildFly S2I images

Make Spec.ApplicationImage optional as the definition of
ApplicationSourceSpec allows an alternative.

Create ImageStream and BuildConfig resources to handle S2I builds

Use image.openshift.io/triggers annotation to trigger statefulset
update when the image stream changes

When a runtime image must be used, set
GALLEON_PROVISION_DEFAULT_FAT_SERVER to true only when
GALLEON_PROVISION_LAYERS is not defined.

ApplicationSourceSpec's GitHubWebHookSecret and GenericWebHookSecret
references secrets in the same namespace than the WildFlyServer resource.
These secrets must have a key named WebHookSecretKey whose value is used
to create the WebHook URL. If they are omitted from the spec, the
operator will automatically generate respective secrets.

Update references to WildFly 19 S2I Images

Signed-off-by: Jeff Mesnil <jmesnil@redhat.com>
@jmesnil
Copy link
Member Author

jmesnil commented Jul 1, 2020

superseded by #147

@jmesnil jmesnil closed this Jul 1, 2020
WildFly Operator automation moved this from In progress to Done Jul 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Basic Install (I) Features for Phase I of the Operator capability levels OpenShift Extra features specific to OpenShift Seamless Upgrades (II) Features for Phase II of the Operator capability levels
Projects
Development

Successfully merging this pull request may close these issues.

Update Operator's applicationImage when an ImageStream change is detected
3 participants