Skip to content

Commit 80f3752

Browse files
authored
Remove Keycloak functionality (#1797)
Signed-off-by: Rizwana777 <rizwananaaz177@gmail.com>
1 parent 5135028 commit 80f3752

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+49
-4415
lines changed

api/v1alpha1/argocd_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ type ArgoCDSSOSpec struct {
636636
Dex *ArgoCDDexSpec `json:"dex,omitempty"`
637637

638638
// Keycloak contains the configuration for Argo CD keycloak authentication
639-
// Deprecated: This field is planned for removal in a future release and will no longer be supported.
639+
// Removed: This field is no longer supported and the related functionality has been removed.
640640
Keycloak *ArgoCDKeycloakSpec `json:"keycloak,omitempty"`
641641

642642
// Deprecated field. Support dropped in v1beta1 version.

api/v1beta1/argocd_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -765,6 +765,7 @@ type ArgoCDSSOSpec struct {
765765
Dex *ArgoCDDexSpec `json:"dex,omitempty"`
766766

767767
// Keycloak contains the configuration for Argo CD keycloak authentication
768+
// Removed: This field is no longer supported and the related functionality has been removed.
768769
Keycloak *ArgoCDKeycloakSpec `json:"keycloak,omitempty"`
769770
}
770771

bundle/manifests/argocd-operator.clusterserviceversion.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ metadata:
257257
capabilities: Deep Insights
258258
categories: Integration & Delivery
259259
certified: "false"
260-
createdAt: "2025-07-26T07:37:32Z"
260+
createdAt: "2025-08-11T08:58:58Z"
261261
description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
262262
operators.operatorframework.io/builder: operator-sdk-v1.35.0
263263
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
@@ -1767,12 +1767,6 @@ spec:
17671767
- deployments/finalizers
17681768
verbs:
17691769
- update
1770-
- apiGroups:
1771-
- apps.openshift.io
1772-
resources:
1773-
- deploymentconfigs
1774-
verbs:
1775-
- '*'
17761770
- apiGroups:
17771771
- argoproj.io
17781772
resources:

bundle/manifests/argoproj.io_argocds.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7542,7 +7542,7 @@ spec:
75427542
keycloak:
75437543
description: |-
75447544
Keycloak contains the configuration for Argo CD keycloak authentication
7545-
Deprecated: This field is planned for removal in a future release and will no longer be supported.
7545+
Removed: This field is no longer supported and the related functionality has been removed.
75467546
properties:
75477547
host:
75487548
description: Host is the hostname to use for Ingress/Route
@@ -28719,8 +28719,9 @@ spec:
2871928719
type: array
2872028720
type: object
2872128721
keycloak:
28722-
description: Keycloak contains the configuration for Argo CD keycloak
28723-
authentication
28722+
description: |-
28723+
Keycloak contains the configuration for Argo CD keycloak authentication
28724+
Removed: This field is no longer supported and the related functionality has been removed.
2872428725
properties:
2872528726
host:
2872628727
description: Host is the hostname to use for Ingress/Route

cmd/main.go

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,8 @@ import (
2525
"strings"
2626

2727
"github.com/argoproj/argo-cd/v3/util/env"
28-
appsv1 "github.com/openshift/api/apps/v1"
2928
configv1 "github.com/openshift/api/config/v1"
30-
oauthv1 "github.com/openshift/api/oauth/v1"
3129
routev1 "github.com/openshift/api/route/v1"
32-
templatev1 "github.com/openshift/api/template/v1"
3330
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
3431
"k8s.io/client-go/kubernetes"
3532
"sigs.k8s.io/controller-runtime/pkg/cache"
@@ -225,25 +222,6 @@ func main() {
225222
}
226223
}
227224

228-
// Setup Schemes for SSO if template instance is available.
229-
if argocd.CanUseKeycloakWithTemplate() {
230-
setupLog.Info("Keycloak instance can be managed using OpenShift Template")
231-
if err := templatev1.Install(mgr.GetScheme()); err != nil {
232-
setupLog.Error(err, "")
233-
os.Exit(1)
234-
}
235-
if err := appsv1.Install(mgr.GetScheme()); err != nil {
236-
setupLog.Error(err, "")
237-
os.Exit(1)
238-
}
239-
if err := oauthv1.Install(mgr.GetScheme()); err != nil {
240-
setupLog.Error(err, "")
241-
os.Exit(1)
242-
}
243-
} else {
244-
setupLog.Info("Keycloak instance cannot be managed using OpenShift Template, as DeploymentConfig/Template API is not present")
245-
}
246-
247225
k8sClient, err := initK8sClient()
248226
if err != nil {
249227
setupLog.Error(err, "Failed to initialize Kubernetes client")

common/defaults.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -148,23 +148,9 @@ const (
148148
// ArgoCDDefaultKustomizeBuildOptions is the default kustomize build options.
149149
ArgoCDDefaultKustomizeBuildOptions = ""
150150

151-
// ArgoCDKeycloakImage is the default Keycloak Image used for the non-openshift platforms when not specified.
152-
ArgoCDKeycloakImage = "quay.io/keycloak/keycloak"
153-
154151
// ArgoCDDefaultLabelSelector is the default Label Selector which will reconcile all ArgoCD instances.
155152
ArgoCDDefaultLabelSelector = ""
156153

157-
// ArgoCDKeycloakVersion is the default Keycloak version used for the non-openshift platform when not specified.
158-
// Version: 15.0.2
159-
ArgoCDKeycloakVersion = "sha256:64fb81886fde61dee55091e6033481fa5ccdac62ae30a4fd29b54eb5e97df6a9"
160-
161-
// ArgoCDKeycloakImageForOpenShift is the default Keycloak Image used for the OpenShift platform when not specified.
162-
ArgoCDKeycloakImageForOpenShift = "registry.redhat.io/rh-sso-7/sso76-openshift-rhel8"
163-
164-
// ArgoCDKeycloakVersionForOpenShift is the default Keycloak version used for the OpenShift platform when not specified.
165-
// Version: 7.6-32
166-
ArgoCDKeycloakVersionForOpenShift = "sha256:ec9f60018694dcc5d431ba47d5536b761b71cb3f66684978fe6bb74c157679ac"
167-
168154
// ArgoCDDefaultOIDCConfig is the default OIDC configuration.
169155
ArgoCDDefaultOIDCConfig = ""
170156

common/keys.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,6 @@ const (
183183
// to be used for the Argo-CD extension image
184184
ArgoCDExtensionImageEnvName = "ARGOCD_EXTENSION_IMAGE"
185185

186-
// ArgoCDKeycloakImageEnvName is the environment variable used to get the image
187-
// to used for the Keycloak container.
188-
ArgoCDKeycloakImageEnvName = "ARGOCD_KEYCLOAK_IMAGE"
189-
190186
// ArgoCDRedisHAProxyImageEnvName is the environment variable used to get the image
191187
// to used for the Redis HA Proxy container.
192188
ArgoCDRedisHAProxyImageEnvName = "ARGOCD_REDIS_HA_PROXY_IMAGE"

config/crd/bases/argoproj.io_argocds.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7531,7 +7531,7 @@ spec:
75317531
keycloak:
75327532
description: |-
75337533
Keycloak contains the configuration for Argo CD keycloak authentication
7534-
Deprecated: This field is planned for removal in a future release and will no longer be supported.
7534+
Removed: This field is no longer supported and the related functionality has been removed.
75357535
properties:
75367536
host:
75377537
description: Host is the hostname to use for Ingress/Route
@@ -28708,8 +28708,9 @@ spec:
2870828708
type: array
2870928709
type: object
2871028710
keycloak:
28711-
description: Keycloak contains the configuration for Argo CD keycloak
28712-
authentication
28711+
description: |-
28712+
Keycloak contains the configuration for Argo CD keycloak authentication
28713+
Removed: This field is no longer supported and the related functionality has been removed.
2871328714
properties:
2871428715
host:
2871528716
description: Host is the hostname to use for Ingress/Route

config/rbac/role.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,6 @@ rules:
5959
- deployments/finalizers
6060
verbs:
6161
- update
62-
- apiGroups:
63-
- apps.openshift.io
64-
resources:
65-
- deploymentconfigs
66-
verbs:
67-
- '*'
6862
- apiGroups:
6963
- argoproj.io
7064
resources:

controllers/argocd/argocd_controller.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ var ActiveInstanceMap = make(map[string]string)
6969

7070
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles;clusterrolebindings,verbs=*
7171
//+kubebuilder:rbac:groups="",resources=configmaps;endpoints;events;persistentvolumeclaims;pods;namespaces;secrets;serviceaccounts;services;services/finalizers,verbs=*
72-
//+kubebuilder:rbac:groups=apps.openshift.io,resources=deploymentconfigs,verbs=*
7372
//+kubebuilder:rbac:groups=apps,resources=deployments;replicasets;daemonsets;statefulsets,verbs=*
7473
//+kubebuilder:rbac:groups=apps,resourceNames=argocd-operator,resources=deployments/finalizers,verbs=update
7574
//+kubebuilder:rbac:groups=argoproj.io,resources=argocds;argocds/finalizers;argocds/status,verbs=*

0 commit comments

Comments
 (0)