Skip to content

🐛 Fix bundle to plain manifest conversion #1899

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 7, 2025
Merged

🐛 Fix bundle to plain manifest conversion #1899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbd7b5e
update deployment resource and fix AllNamespaces cluster permissions
Apr 4, 2025
5e5b649
update generated bundle manifests
Apr 4, 2025
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
8 changes: 7 additions & 1 deletion internal/operator-controller/rukpak/convert/registryv1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/utils/ptr"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/yaml"

Expand Down Expand Up @@ -277,6 +278,11 @@ func (c Converter) Convert(rv1 RegistryV1, installNamespace string, targetNamesp
annotations := util.MergeMaps(rv1.CSV.Annotations, depSpec.Spec.Template.Annotations)
annotations["olm.targetNamespaces"] = strings.Join(targetNamespaces, ",")
depSpec.Spec.Template.Annotations = annotations

// Hardcode the deployment with RevisionHistoryLimit=1 to replicate OLMv0 behavior
// https://github.com/operator-framework/operator-lifecycle-manager/blob/dfd0b2bea85038d3c0d65348bc812d297f16b8d2/pkg/controller/install/deployment.go#L181
depSpec.Spec.RevisionHistoryLimit = ptr.To(int32(1))

deployments = append(deployments, appsv1.Deployment{
TypeMeta: metav1.TypeMeta{
Kind: "Deployment",
Expand Down Expand Up @@ -328,8 +334,8 @@ func (c Converter) Convert(rv1 RegistryV1, installNamespace string, targetNamesp
APIGroups: []string{corev1.GroupName},
Resources: []string{"namespaces"},
})
clusterPermissions = append(clusterPermissions, p)
}
clusterPermissions = append(clusterPermissions, permissions...)
permissions = nil
}

Expand Down
10 changes: 9 additions & 1 deletion ...p91wu25is5i2ec598hni8owq3l71bbkl7iz3.yaml → ...zfarktdile5wekso69zs9bgzb988mhjm0y6p.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: argocd-operator.v0-22gmilmgp91wu25is5i2ec598hni8owq3l71bbkl7iz3
name: argocd-operator.v0.-3gkm3u8zfarktdile5wekso69zs9bgzb988mhjm0y6p
rules:
- apiGroups:
- ""
Expand Down Expand Up @@ -35,3 +35,11 @@ rules:
verbs:
- create
- patch
- apiGroups:
- ""
resources:
- namespaces
verbs:
- get
- list
- watch
4 changes: 2 additions & 2 deletions ...p91wu25is5i2ec598hni8owq3l71bbkl7iz3.yaml → ...zfarktdile5wekso69zs9bgzb988mhjm0y6p.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
creationTimestamp: null
name: argocd-operator.v0-22gmilmgp91wu25is5i2ec598hni8owq3l71bbkl7iz3
name: argocd-operator.v0.-3gkm3u8zfarktdile5wekso69zs9bgzb988mhjm0y6p
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: argocd-operator.v0-22gmilmgp91wu25is5i2ec598hni8owq3l71bbkl7iz3
name: argocd-operator.v0.-3gkm3u8zfarktdile5wekso69zs9bgzb988mhjm0y6p
subjects:
- kind: ServiceAccount
name: argocd-operator-controller-manager
Expand Down
1 change: 1 addition & 0 deletions ...gocd-operator.v0.6.0/all-namespaces/11_deployment_argocd-operator-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
namespace: argocd-system
spec:
replicas: 1
revisionHistoryLimit: 1
selector:
matchLabels:
control-plane: controller-manager
Expand Down
1 change: 1 addition & 0 deletions ...rgocd-operator.v0.6.0/own-namespace/09_deployment_argocd-operator-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
namespace: argocd-system
spec:
replicas: 1
revisionHistoryLimit: 1
selector:
matchLabels:
control-plane: controller-manager
Expand Down
1 change: 1 addition & 0 deletions ...cd-operator.v0.6.0/single-namespace/09_deployment_argocd-operator-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
namespace: argocd-system
spec:
replicas: 1
revisionHistoryLimit: 1
selector:
matchLabels:
control-plane: controller-manager
Expand Down
Loading