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

Fix policy controller dependency #378

Merged
merged 5 commits into from
Dec 18, 2023

Conversation

didierofrivia
Copy link
Member

@didierofrivia didierofrivia commented Dec 14, 2023

This PR fixes the current issue of including the policy-controller manifests from main branch. It also, fixes the generation of manifests for the bundle and samples.

to create a new bundle:

make bundle REGISTRY=quay.io ORG=kuadrant \
    VERSION=0.6.0 \
    AUTHORINO_OPERATOR_VERSION=0.10.0 \
    LIMITADOR_OPERATOR_VERSION=0.7.0 \
    WASM_SHIM_VERSION=release-0.3 \
    POLICY_CONTROLLER_VERSION=0.3.0\
    REPLACES_VERSION=0.5.0 \
    CHANNELS=stable

The git diff should show, between other changes, the following:

diff --git a/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml b/bundle/manifests/kuadrant-operator.clusterserviceversio
n.yaml
index b4571f3..7bd1841 100644
--- a/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml
@@ -761,7 +761,7 @@ spec:
                 - --ocm-hub=false
                 command:
                 - /policy_controller
-                image: quay.io/kuadrant/policy-controller:main
+                image: quay.io/kuadrant/policy-controller:release-0.3

diff --git a/config/dependencies/policy-controller/kustomization.yaml b/config/dependencies/policy-controller/kustomization.yaml
index 60eb380..59cc7c5 100644
--- a/config/dependencies/policy-controller/kustomization.yaml
+++ b/config/dependencies/policy-controller/kustomization.yaml
@@ -1,5 +1,5 @@
 resources:
-- github.com/Kuadrant/multicluster-gateway-controller/config/policy-controller/default?ref=main
+- github.com/Kuadrant/multicluster-gateway-controller/config/policy-controller/default?ref=release-0.3

diff --git a/config/dependencies/policy-controller/samples/kustomization.yaml b/config/dependencies/policy-controller/samples/kustom
ization.yaml
index d02877f..f966942 100644
--- a/config/dependencies/policy-controller/samples/kustomization.yaml
+++ b/config/dependencies/policy-controller/samples/kustomization.yaml
@@ -1,2 +1,2 @@
 resources:
-- github.com/Kuadrant/multicluster-gateway-controller/config/samples?ref=main
+- github.com/Kuadrant/multicluster-gateway-controller/config/samples?ref=release-0.3

While running just make bundle should not generate any changes.

Notes:

Copy link

codecov bot commented Dec 14, 2023

Codecov Report

Merging #378 (f2e8a85) into main (0355953) will decrease coverage by 0.82%.
Report is 2 commits behind head on main.
The diff coverage is n/a.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #378      +/-   ##
==========================================
- Coverage   65.87%   65.05%   -0.82%     
==========================================
  Files          35       35              
  Lines        3795     3795              
==========================================
- Hits         2500     2469      -31     
- Misses       1109     1131      +22     
- Partials      186      195       +9     
Flag Coverage Δ
integration 70.43% <ø> (-1.54%) ⬇️
unit 58.90% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
api/v1beta1 (u) ∅ <ø> (∅)
pkg/common (u) 76.92% <ø> (ø)
pkg/istio (u) 37.11% <ø> (ø)
pkg/log (u) 31.81% <ø> (ø)
pkg/reconcilers (u) 33.21% <ø> (ø)
pkg/rlptools (u) 56.46% <ø> (ø)
controllers (i) 70.43% <ø> (-1.54%) ⬇️

see 7 files with indirect coverage changes

@didierofrivia didierofrivia added this to the v0.6.0 milestone Dec 14, 2023
@didierofrivia didierofrivia self-assigned this Dec 14, 2023
@didierofrivia didierofrivia requested review from pehala and a team December 14, 2023 16:17
@didierofrivia didierofrivia marked this pull request as ready for review December 14, 2023 17:49
@maleck13
Copy link
Collaborator

Changes look ok. @didierofrivia if we were to retag 0.3 would that solve the samples issue?

@didierofrivia
Copy link
Member Author

@maleck13 yes, that'd solve the issue :)

@didierofrivia didierofrivia merged commit bf5fc99 into main Dec 18, 2023
22 checks passed
@didierofrivia didierofrivia deleted the fix-policy-controller-dependency branch December 18, 2023 10:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants