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

feat: merged slot operator #78

Merged
merged 7 commits into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ quarkus.openapi-generator.codegen.spec.onecx_product_store_operator_product_v1_y
quarkus.openapi-generator.codegen.spec.onecx_product_store_operator_product_v1_yaml.base-package=gen.org.tkit.onecx.product.store.product.v1
quarkus.openapi-generator.codegen.spec.onecx_product_store_operator_product_v1_yaml.return-response=true
quarkus.openapi-generator.codegen.spec.onecx_product_store_operator_product_v1_yaml.enable-security-generation=false
quarkus.openapi-generator.codegen.spec.onecx_product_store_operator_slot_v1_yaml.config-key=product_store_client
quarkus.openapi-generator.codegen.spec.onecx_product_store_operator_slot_v1_yaml.base-package=gen.org.tkit.onecx.product.store.slot.v1
quarkus.openapi-generator.codegen.spec.onecx_product_store_operator_slot_v1_yaml.return-response=true
quarkus.openapi-generator.codegen.spec.onecx_product_store_operator_slot_v1_yaml.enable-security-generation=false
----
====

Expand Down Expand Up @@ -63,5 +67,20 @@ app:
kcConfig:
defaultClientScopes: [ ocx-ps-product:write ]

----


fieldRef:
fieldPath: metadata.namespace
serviceAccount:
enabled: true
operator:
keycloak:
client:
enabled: true
spec:
kcConfig:
defaultClientScopes: [ ocx-ps-product:write ]

----

Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ h| Version

| https://onecx.github.io/docs/onecx-quarkus/current/onecx-quarkus/onecx-core.html[Link]
|
| 0.32.0
| 0.34.0

| quarkus-smallrye-health

Expand All @@ -91,13 +91,13 @@ h| Version

|
|
| 6.7.3
| 6.8.3

| quarkus-operator-sdk

|
|
| 6.7.3
| 6.8.3

| quarkus-oidc-client

Expand Down
26 changes: 20 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,18 +114,32 @@
<artifactId>download-maven-plugin</artifactId>
<executions>
<execution>
<id>product-operator-api</id>
<phase>generate-resources</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>https://raw.githubusercontent.com/onecx/onecx-product-store-svc/main/src/main/openapi/onecx-product-store-operator-product-v1.yaml</url>
<outputDirectory>target/tmp/openapi</outputDirectory>
<outputFileName>onecx-product-store-operator-product-v1.yaml</outputFileName>
<skipCache>true</skipCache>
</configuration>
</execution>
<execution>
<id>slot-operator-api</id>
<phase>generate-resources</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>https://raw.githubusercontent.com/onecx/onecx-product-store-svc/main/src/main/openapi/onecx-product-store-operator-slot-v1.yaml</url>
<outputDirectory>target/tmp/openapi</outputDirectory>
<outputFileName>onecx-product-store-operator-slot-v1.yaml</outputFileName>
<skipCache>true</skipCache>
</configuration>
</execution>
</executions>
<configuration>
<url>https://raw.githubusercontent.com/onecx/onecx-product-store-svc/main/src/main/openapi/onecx-product-store-operator-product-v1.yaml</url>
<outputDirectory>target/tmp/openapi</outputDirectory>
<outputFileName>onecx-product-store-operator-product-v1.yaml</outputFileName>
<skipCache>true</skipCache>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
3 changes: 3 additions & 0 deletions src/main/helm/templates/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ rules:
- products
- products/status
- products/finalizers
- slots
- slots/status
- slots/finalizers
verbs:
- get
- list
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ public class LeaderConfiguration extends LeaderElectionConfiguration {
public LeaderConfiguration(OperatorConfig config) {
super(config.leaderElectionConfig().leaseName());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ interface LeaderElectionConfig {
@WithDefault("onecx-product-store-operator-lease")
String leaseName();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@
import org.eclipse.microprofile.rest.client.inject.RestClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.tkit.onecx.product.store.operator.Product;
import org.tkit.onecx.product.store.operator.ProductSpec;
import org.tkit.onecx.product.store.operator.client.mappers.ProductStoreMapper;
import org.tkit.onecx.product.store.operator.product.Product;
import org.tkit.onecx.product.store.operator.product.ProductSpec;
import org.tkit.onecx.product.store.operator.slot.Slot;
import org.tkit.onecx.product.store.operator.slot.SlotSpec;

import gen.org.tkit.onecx.product.store.product.v1.api.OperatorProductApi;
import gen.org.tkit.onecx.product.store.product.v1.model.UpdateProductRequest;
import gen.org.tkit.onecx.product.store.slot.v1.api.OperatorSlotApi;
import gen.org.tkit.onecx.product.store.slot.v1.model.UpdateSlotRequest;

@ApplicationScoped
public class ProductStoreService {
Expand All @@ -25,6 +29,10 @@ public class ProductStoreService {
@RestClient
OperatorProductApi client;

@Inject
@RestClient
OperatorSlotApi slotClient;

public int updateProduct(Product product) {
ProductSpec spec = product.getSpec();
UpdateProductRequest dto = mapper.map(spec);
Expand All @@ -34,4 +42,13 @@ public int updateProduct(Product product) {
}
}

public int updateSlot(Slot slot) {
SlotSpec spec = slot.getSpec();
UpdateSlotRequest dto = mapper.map(spec);
try (var response = slotClient.createOrUpdateSlot(spec.getProductName(), spec.getAppId(), dto)) {
log.info("Update micro-fronted response {}", response.getStatus());
return response.getStatus();
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@

import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.tkit.onecx.product.store.operator.ProductSpec;
import org.tkit.onecx.product.store.operator.product.ProductSpec;
import org.tkit.onecx.product.store.operator.slot.SlotSpec;

import gen.org.tkit.onecx.product.store.product.v1.model.UpdateProductRequest;
import gen.org.tkit.onecx.product.store.slot.v1.model.UpdateSlotRequest;

@Mapper
public interface ProductStoreMapper {

@Mapping(target = "undeployed", constant = "false")
UpdateProductRequest map(ProductSpec spec);

@Mapping(target = "undeployed", constant = "false")
UpdateSlotRequest map(SlotSpec spec);
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.tkit.onecx.product.store.operator;
package org.tkit.onecx.product.store.operator.product;

import io.fabric8.kubernetes.api.model.Namespaced;
import io.fabric8.kubernetes.client.CustomResource;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.tkit.onecx.product.store.operator;
package org.tkit.onecx.product.store.operator.product;

import jakarta.inject.Inject;
import jakarta.ws.rs.WebApplicationException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.tkit.onecx.product.store.operator;
package org.tkit.onecx.product.store.operator.product;

import java.util.Set;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.tkit.onecx.product.store.operator;
package org.tkit.onecx.product.store.operator.product;

import com.fasterxml.jackson.annotation.JsonProperty;

Expand Down
11 changes: 11 additions & 0 deletions src/main/java/org/tkit/onecx/product/store/operator/slot/Slot.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package org.tkit.onecx.product.store.operator.slot;

import io.fabric8.kubernetes.api.model.Namespaced;
import io.fabric8.kubernetes.client.CustomResource;
import io.fabric8.kubernetes.model.annotation.Group;
import io.fabric8.kubernetes.model.annotation.Version;

@Version("v1")
@Group("onecx.tkit.org")
public class Slot extends CustomResource<SlotSpec, SlotStatus> implements Namespaced {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
package org.tkit.onecx.product.store.operator.slot;

import static io.javaoperatorsdk.operator.api.reconciler.Constants.WATCH_CURRENT_NAMESPACE;

import jakarta.inject.Inject;
import jakarta.ws.rs.WebApplicationException;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.tkit.onecx.product.store.operator.client.ProductStoreService;

import io.javaoperatorsdk.operator.api.reconciler.*;
import io.javaoperatorsdk.operator.processing.event.source.filter.OnAddFilter;
import io.javaoperatorsdk.operator.processing.event.source.filter.OnUpdateFilter;

@ControllerConfiguration(name = "slot", namespaces = WATCH_CURRENT_NAMESPACE, onAddFilter = SlotController.SlotAddFilter.class, onUpdateFilter = SlotController.SlotUpdateFilter.class)
public class SlotController implements Reconciler<Slot>, ErrorStatusHandler<Slot> {

private static final Logger log = LoggerFactory.getLogger(SlotController.class);

@Inject
ProductStoreService service;

@Override
public UpdateControl<Slot> reconcile(Slot slot, Context<Slot> context)
throws Exception {

String appId = slot.getSpec().getAppId();
String productName = slot.getSpec().getProductName();
String name = slot.getSpec().getName();

log.info("Reconcile microservice: {} for product: {}, name: {}", appId, productName, name);
int responseCode = service.updateSlot(slot);

updateStatusPojo(slot, responseCode);
log.info("Microservice '{}' reconciled - updating status", slot.getMetadata().getName());
return UpdateControl.updateStatus(slot);

}

@Override
public ErrorStatusUpdateControl<Slot> updateErrorStatus(Slot slot,
Context<Slot> context, Exception e) {

int responseCode = -1;
if (e.getCause() instanceof WebApplicationException re) {
responseCode = re.getResponse().getStatus();
}

log.error("Error reconcile resource", e);
var status = new SlotStatus();
status.setRequestProductName(null);
status.setRequestAppId(null);
status.setRequestName(null);
status.setResponseCode(responseCode);
status.setStatus(SlotStatus.Status.ERROR);
status.setMessage(e.getMessage());
slot.setStatus(status);
return ErrorStatusUpdateControl.updateStatus(slot);
}

private void updateStatusPojo(Slot slot, int responseCode) {
var result = new SlotStatus();
var spec = slot.getSpec();
result.setRequestProductName(spec.getProductName());
result.setRequestAppId(spec.getAppId());
result.setRequestName(spec.getName());
result.setResponseCode(responseCode);
var status = switch (responseCode) {
case 201:
yield SlotStatus.Status.CREATED;
case 200:
yield SlotStatus.Status.UPDATED;
default:
yield SlotStatus.Status.UNDEFINED;
};
result.setStatus(status);
slot.setStatus(result);
}

public static class SlotAddFilter implements OnAddFilter<Slot> {

@Override
public boolean accept(Slot resource) {
return resource.getSpec() != null;
}
}

public static class SlotUpdateFilter implements OnUpdateFilter<Slot> {

@Override
public boolean accept(Slot newResource, Slot oldResource) {
return newResource.getSpec() != null;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package org.tkit.onecx.product.store.operator.slot;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;

@JsonInclude(JsonInclude.Include.NON_NULL)
public class SlotSpec {

@JsonProperty("appId")
private String appId;

@JsonProperty("productName")
private String productName;

@JsonProperty("description")
private String description;

@JsonProperty("name")
private String name;

@JsonProperty(value = "deprecated")
private boolean deprecated = false;

public String getAppId() {
return appId;
}

public void setAppId(String appId) {
this.appId = appId;
}

public String getProductName() {
return productName;
}

public void setProductName(String productName) {
this.productName = productName;
}

public String getDescription() {
return description;
}

public void setDescription(String description) {
this.description = description;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public void setDeprecated(boolean deprecated) {
this.deprecated = deprecated;
}

public boolean isDeprecated() {
return deprecated;
}

@Override
public String toString() {
return "SlotSpec{" + "appId='" + appId + "', productName='" + productName + "', name='" + name + "'}";
}
}
Loading
Loading