Skip to content

Commit

Permalink
fix: do not build docs module when performing native build
Browse files Browse the repository at this point in the history
  • Loading branch information
metacosm committed May 3, 2023
1 parent 1561276 commit f1a981c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-for-quarkus-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
run: mvn -B formatter:validate install --file pom.xml

- name: Build with Maven (Native)
run: mvn -B formatter:validate install -Dnative --file pom.xml
run: mvn -B formatter:validate install -Dnative --file pom.xml -pl '!docs'

- name: Kubernetes KinD Cluster
uses: container-tools/kind-action@v2
Expand Down
20 changes: 10 additions & 10 deletions samples/exposedapp/src/main/java/io/halkyon/IngressDependent.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@
import static io.halkyon.ExposedAppReconciler.LABELS_CONTEXT_KEY;
import static io.halkyon.ExposedAppReconciler.createMetadata;

import com.dajudge.kindcontainer.client.model.base.Metadata;
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
import io.javaoperatorsdk.operator.processing.dependent.Matcher;
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.GenericKubernetesResourceMatcher;
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.ResourceUpdatePreProcessor;
import java.util.Map;

import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
import io.fabric8.kubernetes.api.model.networking.v1.IngressBuilder;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
import io.javaoperatorsdk.operator.processing.dependent.Matcher;
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.GenericKubernetesResourceMatcher;
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.ResourceUpdatePreProcessor;
import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;

public class IngressDependent extends CRUDKubernetesDependentResource<Ingress, ExposedApp> implements
Expand All @@ -26,7 +25,7 @@ public IngressDependent() {

@Override
public Result<Ingress> match(Ingress actualResource, ExposedApp primary,
Context<ExposedApp> context) {
Context<ExposedApp> context) {
return GenericKubernetesResourceMatcher.match(this, actualResource, primary, context, true);
}

Expand All @@ -36,10 +35,11 @@ public Ingress desired(ExposedApp exposedApp, Context context) {
final var labels = (Map<String, String>) context.managedDependentResourceContext()
.getMandatory(LABELS_CONTEXT_KEY, Map.class);
final var metadata = createMetadata(exposedApp, labels);
/*metadata.setAnnotations(Map.of(
"nginx.ingress.kubernetes.io/rewrite-target", "/",
"kubernetes.io/ingress.class", "nginx"));
*/
/*
* metadata.setAnnotations(Map.of(
* "nginx.ingress.kubernetes.io/rewrite-target", "/",
* "kubernetes.io/ingress.class", "nginx"));
*/
return new IngressBuilder()
.withMetadata(metadata)
.withNewSpec()
Expand Down

0 comments on commit f1a981c

Please sign in to comment.