Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: stay on Quarkus < 3.5 for 6.4 as we need to stay with Fabric8 6.7.2
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Laprun <[email protected]>
metacosm committed Dec 2, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 8bc9ccc commit 6c7b140
Showing 5 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/project.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Java Operator SDK Extension
release:
current-version: 6.4.0
next-version: 6.4.1-SNAPSHOT
current-version: 6.4.1
next-version: 6.4.2-SNAPSHOT

2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ jobs:
uses: ./.github/workflows/build-for-quarkus-version.yml
with:
# quarkus-version-jq-cmd: ${{ matrix.quarkus-version-jq-cmd }}
quarkus-version: 3.6.0.CR1
quarkus-version: 3.4.3
java-version: ${{ matrix.java-version }}
branch: ${{ needs.extract-branch-name.outputs.branch_name }}
native-modules: "integration-tests"
Original file line number Diff line number Diff line change
@@ -284,13 +284,13 @@ public byte[] getManifestData(List<ServiceAccount> serviceAccounts, List<Cluster
return YAML_MAPPER.writeValueAsBytes(csv);
}

private void handleDeployments(List<Deployment> deployments, NamedInstallStrategyFluent<?>.SpecNested<?> installSpec) {
private void handleDeployments(List<Deployment> deployments, NamedInstallStrategyFluent.SpecNested<?> installSpec) {
deployments.forEach(deployment -> handleDeployment(deployment, installSpec));
}

private void handlePermissions(List<ClusterRole> clusterRoles, List<RoleBinding> roleBindings, List<Role> roles,
String defaultServiceAccountName,
NamedInstallStrategyFluent<?>.SpecNested<?> installSpec) {
NamedInstallStrategyFluent.SpecNested<?> installSpec) {
Map<String, List<PolicyRule>> customPermissionRules = new HashMap<>();
if (metadata.permissionRules != null) {
for (CSVMetadataHolder.PermissionRule permissionRule : metadata.permissionRules) {
@@ -323,7 +323,7 @@ private void handlePermissions(List<ClusterRole> clusterRoles, List<RoleBinding>
private void handleClusterPermissions(List<ClusterRoleBinding> clusterRoleBindings, List<ClusterRole> clusterRoles,
List<Role> roles,
String defaultServiceAccountName,
NamedInstallStrategyFluent<?>.SpecNested<?> installSpec) {
NamedInstallStrategyFluent.SpecNested<?> installSpec) {
for (ClusterRoleBinding binding : clusterRoleBindings) {
String serviceAccountName = findServiceAccountFromSubjects(binding.getSubjects(), defaultServiceAccountName);
if (NO_SERVICE_ACCOUNT.equals(serviceAccountName)) {
@@ -336,7 +336,7 @@ private void handleClusterPermissions(List<ClusterRoleBinding> clusterRoleBindin
}
}

private void handleDeployment(Deployment deployment, NamedInstallStrategyFluent<?>.SpecNested<?> installSpec) {
private void handleDeployment(Deployment deployment, NamedInstallStrategyFluent.SpecNested<?> installSpec) {
if (deployment != null) {
final var deploymentName = deployment.getMetadata().getName();
var deploymentSpec = deployment.getSpec();
@@ -375,7 +375,7 @@ private void handleDeployment(Deployment deployment, NamedInstallStrategyFluent<
}

private void handlerPermission(List<PolicyRule> rules, String serviceAccountName,
NamedInstallStrategyFluent<?>.SpecNested<?> installSpec) {
NamedInstallStrategyFluent.SpecNested<?> installSpec) {
if (!rules.isEmpty()) {
Predicate<StrategyDeploymentPermissionsBuilder> sameServiceAccountName = p -> serviceAccountName
.equals(p.getServiceAccountName());
@@ -394,7 +394,7 @@ private void handlerPermission(List<PolicyRule> rules, String serviceAccountName

private void handleClusterPermission(List<PolicyRule> rules,
String serviceAccountName,
NamedInstallStrategyFluent<?>.SpecNested<?> installSpec) {
NamedInstallStrategyFluent.SpecNested<?> installSpec) {

Predicate<StrategyDeploymentPermissionsBuilder> sameServiceAccountName = p -> serviceAccountName
.equals(p.getServiceAccountName());
2 changes: 1 addition & 1 deletion docs/modules/ROOT/pages/includes/attributes.adoc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
:project-version: 6.4.0
:project-version: 6.4.1

:examples-dir: ./../examples/
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
<packaging>pom</packaging>
<name>Quarkus - Operator SDK - Parent</name>
<properties>
<quarkus.version>3.5.2</quarkus.version>
<quarkus.version>3.4.3</quarkus.version>
<java-operator-sdk.version>4.5.0</java-operator-sdk.version>
</properties>
<scm>

0 comments on commit 6c7b140

Please sign in to comment.