diff --git a/bundle/manifests/gitops-operator.clusterserviceversion.yaml b/bundle/manifests/gitops-operator.clusterserviceversion.yaml index d50f99175..fbf69acef 100644 --- a/bundle/manifests/gitops-operator.clusterserviceversion.yaml +++ b/bundle/manifests/gitops-operator.clusterserviceversion.yaml @@ -316,20 +316,18 @@ spec: target OpenShift and Kubernetes clusters\n* Support for the Helm and Kustomize templating tools\n* Configuration drift detection and visualization on live clusters\n* Audit trails of rollouts to the clusters\n* Monitoring and logging integration - with OpenShift\n* Automated GitOps bootstrapping using Tekton and Argo CD with - [GitOps Application Manager CLI](https://github.com/redhat-developer/kam)\n\n## - Components\n* Argo CD 2.7.6\n* GitOps Application Manager CLI ([download](https://github.com/redhat-developer/kam/releases))\n\n## - How to Install \nAfter installing the OpenShift GitOps operator, an instance of - Argo CD is installed in the `openshift-gitops` namespace which has sufficent privileges - for managing cluster configurations. You can create additional Argo CD instances - using the `ArgoCD` custom resource within the desired namespaces.\n```yaml\napiVersion: - argoproj.io/v1alpha1\nkind: ArgoCD\nmetadata:\n name: argocd\nspec:\n server:\n - \ route:\n enabled: true\n```\n\nOpenShift GitOps is a layered product - on top of OpenShift that enables teams to adopt GitOps principles for managing - cluster configurations and automating secure and repeatable application delivery - across hybrid multi-cluster Kubernetes environments. OpenShift GitOps is built - around Argo CD as the core upstream project and assists customers to establish - an end-to-end application delivery workflow on GitOps principles.\n" + with OpenShift\n##Components\n* Argo CD 2.7.6\n\n## How to Install \nAfter installing + the OpenShift GitOps operator, an instance of Argo CD is installed in the `openshift-gitops` + namespace which has sufficent privileges for managing cluster configurations. + You can create additional Argo CD instances using the `ArgoCD` custom resource + within the desired namespaces.\n```yaml\napiVersion: argoproj.io/v1alpha1\nkind: + ArgoCD\nmetadata:\n name: argocd\nspec:\n server:\n route:\n enabled: + true\n```\n\nOpenShift GitOps is a layered product on top of OpenShift that enables + teams to adopt GitOps principles for managing cluster configurations and automating + secure and repeatable application delivery across hybrid multi-cluster Kubernetes + environments. OpenShift GitOps is built around Argo CD as the core upstream project + and assists customers to establish an end-to-end application delivery workflow + on GitOps principles.\n" displayName: Red Hat OpenShift GitOps icon: - base64data: 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 @@ -1117,11 +1115,6 @@ spec: - devtools - gitops - pipelines - links: - - name: Day 1 Operations - url: https://github.com/redhat-developer/kam/tree/master/docs/journey/day1 - - name: Day 2 Operations - url: https://github.com/redhat-developer/kam/tree/master/docs/journey/day2 maintainers: - email: shbose@redhat.com name: shoubhik diff --git a/config/manifests/bases/gitops-operator.clusterserviceversion.yaml b/config/manifests/bases/gitops-operator.clusterserviceversion.yaml index dd1490e48..2aeac140a 100644 --- a/config/manifests/bases/gitops-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/gitops-operator.clusterserviceversion.yaml @@ -155,11 +155,6 @@ spec: - devtools - gitops - pipelines - links: - - name: Day 1 Operations - url: https://github.com/redhat-developer/kam/tree/master/docs/journey/day1 - - name: Day 2 Operations - url: https://github.com/redhat-developer/kam/tree/master/docs/journey/day2 maintainers: - email: shbose@redhat.com name: shoubhik diff --git a/config/manifests/patches/description.yaml b/config/manifests/patches/description.yaml index 489ad5fce..da33e71b5 100644 --- a/config/manifests/patches/description.yaml +++ b/config/manifests/patches/description.yaml @@ -11,9 +11,7 @@ target OpenShift and Kubernetes clusters\n* Support for the Helm and Kustomize templating tools\n* Configuration drift detection and visualization on live clusters\n* Audit trails of rollouts to the clusters\n* Monitoring and logging integration - with OpenShift\n* Automated GitOps bootstrapping using Tekton and Argo CD with - [GitOps Application Manager CLI](https://github.com/redhat-developer/kam)\n\n## - Components\n* Argo CD 2.7.6\n* GitOps Application Manager CLI ([download](https://github.com/redhat-developer/kam/releases))\n\n## + with OpenShift\n##Components\n* Argo CD 2.7.6\n\n## How to Install \nAfter installing the OpenShift GitOps operator, an instance of Argo CD is installed in the `openshift-gitops` namespace which has sufficent privileges for managing cluster configurations. You can create additional Argo CD instances diff --git a/controllers/consoleplugin.go b/controllers/consoleplugin.go index e6540627d..61a4e7b80 100644 --- a/controllers/consoleplugin.go +++ b/controllers/consoleplugin.go @@ -41,6 +41,7 @@ const ( kubeAppLabelPartOf = "app.kubernetes.io/part-of" kubeAppLabelRuntimeNamespace = "app.kubernetes.io/runtime-namespace" httpdConfigMapName = "httpd-cfg" + kubeAppLabelName = "app.kubernetes.io/name" ) func getPluginPodSpec() corev1.PodSpec { diff --git a/controllers/gitopsservice_controller.go b/controllers/gitopsservice_controller.go index ab1e939b9..5c47afe00 100644 --- a/controllers/gitopsservice_controller.go +++ b/controllers/gitopsservice_controller.go @@ -254,10 +254,6 @@ func (r *ReconcileGitopsService) Reconcile(ctx context.Context, request reconcil return result, err } - if result, err := r.reconcileCLIServer(instance, request); err != nil { - return result, err - } - dynamicPluginStartOCPVersion := os.Getenv(dynamicPluginStartOCPVersionEnv) if dynamicPluginStartOCPVersion == "" { dynamicPluginStartOCPVersion = common.DefaultDynamicPluginStartOCPVersion diff --git a/controllers/gitopsservice_controller_test.go b/controllers/gitopsservice_controller_test.go index 145d50b4c..9b5d2478c 100644 --- a/controllers/gitopsservice_controller_test.go +++ b/controllers/gitopsservice_controller_test.go @@ -70,26 +70,6 @@ func TestImageFromEnvVariable(t *testing.T) { } }) - t.Run("Kam Image present as env variable", func(t *testing.T) { - image := "quay.io/org/test" - t.Setenv(cliImageEnvName, image) - - deployment := newDeploymentForCLI() - - got := deployment.Spec.Template.Spec.Containers[0].Image - if got != image { - t.Errorf("Image mismatch: got %s, want %s", got, image) - } - }) - t.Run("env variable for Kam image not found", func(t *testing.T) { - deployment := newDeploymentForCLI() - - got := deployment.Spec.Template.Spec.Containers[0].Image - if got != cliImage { - t.Errorf("Image mismatch: got %s, want %s", got, cliImage) - } - }) - } func TestReconcileDefaultForArgoCDNodeplacement(t *testing.T) { @@ -497,53 +477,6 @@ func TestReconcile_BackendSecurityContext(t *testing.T) { assert.DeepEqual(t, securityContext, want) } -func TestReconcile_KamSecurityContext(t *testing.T) { - logf.SetLogger(argocd.ZapLogger(true)) - s := scheme.Scheme - addKnownTypesToScheme(s) - - util.SetConsoleAPIFound(true) - defer util.SetConsoleAPIFound(false) - - // Testing on OCP versions < 4.11.0 - fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(util.NewClusterVersion("4.12.1"), newGitopsService()).Build() - reconciler := newReconcileGitOpsService(fakeClient, s) - - _, err := reconciler.Reconcile(context.TODO(), newRequest("test", "test")) - assertNoError(t, err) - - deployment := appsv1.Deployment{} - err = fakeClient.Get(context.TODO(), types.NamespacedName{Name: cliName, Namespace: serviceNamespace}, &deployment) - assertNoError(t, err) - - // Testing on OCP versions < 4.11.0 - - fakeClient = fake.NewClientBuilder().WithScheme(s).WithObjects(util.NewClusterVersion("4.12.1"), newGitopsService()).Build() - reconciler = newReconcileGitOpsService(fakeClient, s) - - _, err = reconciler.Reconcile(context.TODO(), newRequest("test", "test")) - assertNoError(t, err) - - deployment = appsv1.Deployment{} - err = fakeClient.Get(context.TODO(), types.NamespacedName{Name: cliName, Namespace: serviceNamespace}, &deployment) - assertNoError(t, err) - - securityContext := deployment.Spec.Template.Spec.Containers[0].SecurityContext - want := &corev1.SecurityContext{ - AllowPrivilegeEscalation: util.BoolPtr(false), - Capabilities: &corev1.Capabilities{ - Drop: []corev1.Capability{ - "ALL", - }, - }, - RunAsNonRoot: util.BoolPtr(true), - SeccompProfile: &corev1.SeccompProfile{ - Type: corev1.SeccompProfileTypeRuntimeDefault, - }, - } - assert.DeepEqual(t, securityContext, want) -} - func TestReconcile_testArgoCDForOperatorUpgrade(t *testing.T) { logf.SetLogger(argocd.ZapLogger(true)) s := scheme.Scheme diff --git a/controllers/kam.go b/controllers/kam.go deleted file mode 100644 index af6d51f37..000000000 --- a/controllers/kam.go +++ /dev/null @@ -1,308 +0,0 @@ -/* -Copyright 2021. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package controllers - -import ( - "context" - "fmt" - "os" - "reflect" - - resourcev1 "k8s.io/apimachinery/pkg/api/resource" - - argocommon "github.com/argoproj-labs/argocd-operator/common" - argocdutil "github.com/argoproj-labs/argocd-operator/controllers/argoutil" - console "github.com/openshift/api/console/v1" - routev1 "github.com/openshift/api/route/v1" - pipelinesv1alpha1 "github.com/redhat-developer/gitops-operator/api/v1alpha1" - "github.com/redhat-developer/gitops-operator/common" - "github.com/redhat-developer/gitops-operator/controllers/util" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/util/intstr" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "sigs.k8s.io/controller-runtime/pkg/reconcile" -) - -const cliName = "kam" -const cliLongName = "GitOps Application Manager" -const cliImage = "quay.io/redhat-developer/kam:v0.0.19" -const cliImageEnvName = "KAM_IMAGE" -const kubeAppLabelName = "app.kubernetes.io/name" - -func newDeploymentForCLI() *appsv1.Deployment { - image := os.Getenv(cliImageEnvName) - if image == "" { - image = cliImage - } - podSpec := corev1.PodSpec{ - Containers: []corev1.Container{ - { - Name: cliName, - Image: image, - Ports: []corev1.ContainerPort{ - { - Name: "http", - Protocol: corev1.ProtocolTCP, - ContainerPort: port, // should come from flag - }, - }, - Resources: corev1.ResourceRequirements{ - Requests: corev1.ResourceList{ - corev1.ResourceMemory: resourcev1.MustParse("128Mi"), - corev1.ResourceCPU: resourcev1.MustParse("250m"), - }, - Limits: corev1.ResourceList{ - corev1.ResourceMemory: resourcev1.MustParse("256Mi"), - corev1.ResourceCPU: resourcev1.MustParse("500m"), - }, - }, - }, - }, - } - - template := corev1.PodTemplateSpec{ - ObjectMeta: metav1.ObjectMeta{ - Labels: map[string]string{ - kubeAppLabelName: cliName, - }, - }, - Spec: podSpec, - } - - var replicas int32 = 1 - deploymentSpec := appsv1.DeploymentSpec{ - Replicas: &replicas, - Selector: &metav1.LabelSelector{ - MatchLabels: map[string]string{ - kubeAppLabelName: cliName, - }, - }, - Template: template, - } - - deploymentObj := &appsv1.Deployment{ - ObjectMeta: objectMeta(cliName, serviceNamespace), - Spec: deploymentSpec, - } - - return deploymentObj -} - -func newServiceForCLI() *corev1.Service { - - spec := corev1.ServiceSpec{ - Ports: []corev1.ServicePort{ - { - Name: "tcp-8080", - Port: port, - Protocol: corev1.ProtocolTCP, - TargetPort: intstr.FromInt(int(port)), - }, - { - Name: "tcp-8443", - Port: portTLS, - Protocol: corev1.ProtocolTCP, - TargetPort: intstr.FromInt(int(portTLS)), - }, - }, - Selector: map[string]string{ - kubeAppLabelName: cliName, - }, - } - svc := &corev1.Service{ - ObjectMeta: objectMeta(cliName, serviceNamespace), - Spec: spec, - } - return svc -} - -func newRouteForCLI() *routev1.Route { - routeSpec := routev1.RouteSpec{ - To: routev1.RouteTargetReference{ - Kind: "Service", - Name: cliName, - }, - Port: &routev1.RoutePort{ - TargetPort: intstr.IntOrString{IntVal: portTLS}, - }, - TLS: &routev1.TLSConfig{ - Termination: routev1.TLSTerminationPassthrough, - InsecureEdgeTerminationPolicy: routev1.InsecureEdgeTerminationPolicyNone, - }, - } - - return &routev1.Route{ - ObjectMeta: objectMeta(cliName, serviceNamespace), - Spec: routeSpec, - } -} - -func newConsoleCLIDownload(consoleLinkName, href, text string) *console.ConsoleCLIDownload { - return &console.ConsoleCLIDownload{ - ObjectMeta: metav1.ObjectMeta{ - Name: consoleLinkName, - }, - Spec: console.ConsoleCLIDownloadSpec{ - Links: []console.CLIDownloadLink{ - { - Text: text, - Href: href, - }, - }, - Description: text, - DisplayName: text, - }, - } -} - -func (r *ReconcileGitopsService) reconcileCLIServer(cr *pipelinesv1alpha1.GitopsService, request reconcile.Request) (reconcile.Result, error) { - - reqLogger := logs.WithValues("Request.Namespace", request.Namespace, "Request.Name", request.Name) - - if !util.IsConsoleAPIFound() { - reqLogger.Info("Skip cli server reconcile: OpenShift Console API not found") - return reconcile.Result{}, nil - } - - deploymentObj := newDeploymentForCLI() - - // Add SeccompProfile based on cluster version - util.AddSeccompProfileForOpenShift(r.Client, &deploymentObj.Spec.Template.Spec) - - deploymentObj.Spec.Template.Spec.NodeSelector = argocommon.DefaultNodeSelector() - - if err := controllerutil.SetControllerReference(cr, deploymentObj, r.Scheme); err != nil { - return reconcile.Result{}, err - } - if cr.Spec.RunOnInfra { - deploymentObj.Spec.Template.Spec.NodeSelector[common.InfraNodeLabelSelector] = "" - } - if len(cr.Spec.NodeSelector) > 0 { - deploymentObj.Spec.Template.Spec.NodeSelector = argocdutil.AppendStringMap(deploymentObj.Spec.Template.Spec.NodeSelector, cr.Spec.NodeSelector) - } - - if len(cr.Spec.Tolerations) > 0 { - deploymentObj.Spec.Template.Spec.Tolerations = cr.Spec.Tolerations - } - // Check if this Deployment already exists - existingDeployment := &appsv1.Deployment{} - err := r.Client.Get(context.TODO(), types.NamespacedName{Name: deploymentObj.Name, Namespace: deploymentObj.Namespace}, existingDeployment) - if err != nil { - if errors.IsNotFound(err) { - reqLogger.Info("Creating a new Deployment", "Namespace", deploymentObj.Namespace, "Name", deploymentObj.Name) - err = r.Client.Create(context.TODO(), deploymentObj) - if err != nil { - return reconcile.Result{}, err - } - } else { - return reconcile.Result{}, err - } - } else { - changed := false - if existingDeployment.Spec.Template.Spec.Containers[0].Resources.Requests == nil { - existingDeployment.Spec.Template.Spec.Containers[0].Resources = deploymentObj.Spec.Template.Spec.Containers[0].Resources - changed = true - } - if !reflect.DeepEqual(existingDeployment.Spec.Template.Spec.Containers[0].Image, deploymentObj.Spec.Template.Spec.Containers[0].Image) { - existingDeployment.Spec.Template.Spec.Containers[0].Image = deploymentObj.Spec.Template.Spec.Containers[0].Image - changed = true - } - if !reflect.DeepEqual(existingDeployment.Spec.Template.Spec.NodeSelector, deploymentObj.Spec.Template.Spec.NodeSelector) { - existingDeployment.Spec.Template.Spec.NodeSelector = deploymentObj.Spec.Template.Spec.NodeSelector - changed = true - } - if !reflect.DeepEqual(existingDeployment.Spec.Template.Spec.Tolerations, deploymentObj.Spec.Template.Spec.Tolerations) { - existingDeployment.Spec.Template.Spec.Tolerations = deploymentObj.Spec.Template.Spec.Tolerations - changed = true - } - if !reflect.DeepEqual(existingDeployment.Spec.Template.Spec.SecurityContext, deploymentObj.Spec.Template.Spec.SecurityContext) { - existingDeployment.Spec.Template.Spec.SecurityContext = deploymentObj.Spec.Template.Spec.SecurityContext - changed = true - } - if !reflect.DeepEqual(existingDeployment.Spec.Template.Spec.Containers[0].SecurityContext, deploymentObj.Spec.Template.Spec.Containers[0].SecurityContext) { - existingDeployment.Spec.Template.Spec.Containers[0].SecurityContext = deploymentObj.Spec.Template.Spec.Containers[0].SecurityContext - changed = true - } - - if changed { - err = r.Client.Update(context.TODO(), existingDeployment) - if err != nil { - return reconcile.Result{}, err - } - } - } - serviceRef := newServiceForCLI() - if err := controllerutil.SetControllerReference(cr, serviceRef, r.Scheme); err != nil { - return reconcile.Result{}, err - } - - // Check if this Service already exists - err = r.Client.Get(context.TODO(), types.NamespacedName{Name: serviceRef.Name, Namespace: serviceRef.Namespace}, &corev1.Service{}) - if err != nil { - if errors.IsNotFound(err) { - reqLogger.Info("Creating a new Service", "Namespace", deploymentObj.Namespace, "Name", deploymentObj.Name) - err = r.Client.Create(context.TODO(), serviceRef) - if err != nil { - return reconcile.Result{}, err - } - } else { - return reconcile.Result{}, err - } - } - - routeRef := newRouteForCLI() - if err := controllerutil.SetControllerReference(cr, routeRef, r.Scheme); err != nil { - return reconcile.Result{}, err - } - - err = r.Client.Get(context.TODO(), types.NamespacedName{Name: routeRef.Name, Namespace: routeRef.Namespace}, &routev1.Route{}) - if err != nil { - if errors.IsNotFound(err) { - reqLogger.Info("Creating a new Route", "Namespace", routeRef.Namespace, "Name", routeRef.Name) - err = r.Client.Create(context.TODO(), routeRef) - if err != nil { - return reconcile.Result{}, err - } - } else { - return reconcile.Result{}, err - } - } - - err = r.Client.Get(context.TODO(), types.NamespacedName{Name: routeRef.Name, Namespace: routeRef.Namespace}, routeRef) - kamDownloadURLgo := fmt.Sprintf("https://%s/kam/", routeRef.Spec.Host) - - consoleCLIDownload := newConsoleCLIDownload(cliName, kamDownloadURLgo, cliLongName) - if err := controllerutil.SetControllerReference(cr, consoleCLIDownload, r.Scheme); err != nil { - return reconcile.Result{}, err - } - - err = r.Client.Get(context.TODO(), types.NamespacedName{Name: consoleCLIDownload.Name}, &console.ConsoleCLIDownload{}) - if err != nil { - if errors.IsNotFound(err) { - reqLogger.Info("Creating a new ConsoleDownload", "ConsoleDownload.Name", consoleCLIDownload.Name) - return reconcile.Result{}, r.Client.Create(context.TODO(), consoleCLIDownload) - } - reqLogger.Error(err, "Failed to create ConsoleDownload", "ConsoleDownload.Name", consoleCLIDownload.Name) - return reconcile.Result{}, err - } - - return reconcile.Result{}, nil -} diff --git a/docs/OpenShift GitOps Usage Guide.md b/docs/OpenShift GitOps Usage Guide.md index 9a36d835a..fd2959c34 100644 --- a/docs/OpenShift GitOps Usage Guide.md +++ b/docs/OpenShift GitOps Usage Guide.md @@ -5,22 +5,21 @@ 2. [Configure SSO for OpenShift GitOps](#configure-sso-for-openshift-gitops) a. [Dex](#dex) b. [RHSSO / Keycloak](#rhssokeycloak) -4. [Setting environment variables](#setting-environment-variables) -6. [Getting started with GitOps Application Manager (kam)](#getting-started-with-gitops-application-manager-kam) -7. [Setting up a new ArgoCD instance](#setting-up-a-new-argo-cd-instance) -8. [Configure resource quota/requests for OpenShift GitOps workloads](#configure-resource-quotarequests-for-openshift-gitops-workloads) -9. [Running default Gitops workloads on Infrastructure Nodes](#running-default-gitops-workloads-on-infrastructure-nodes) -10. [Using NodeSelector and Tolerations in Default Instance of Openshift GitOps](#using-nodeselector-and-tolerations-in-default-instance-of-openshift-gitops) -11. [Monitoring](#monitoring) -12. [Logging](#logging) -13. [Prevent auto-reboot during Argo CD sync with machine configs](#prevent-auto-reboot-during-argo-cd-sync-with-machine-configs) -14. [Machine configs and Argo CD: Performance challenges](#machine-configs-and-argo-cd-performance-challenges) -15. [Health status of OpenShift resources](#health-status-of-openshift-resources) -16. [Upgrade GitOps Operator from v1.0.1 to v1.1.0 (GA)](#upgrade-gitops-operator-from-v101-to-v110-ga) -17. [Upgrade GitOps Operator from v1.1.2 to v1.2.0 (GA)](#upgrade-gitops-operator-from-v112-to-v120-ga) -18. [GitOps Monitoring Dashboards](#gitops-monitoring-dashboards) -19. [Integrate GitOps with Secrets Management](Integrate%20GitOps%20with%20Secrets%20Management.md) -20. [Using ApplicationSets](#using-applicationsets) +3. [Setting environment variables](#setting-environment-variables) +4. [Setting up a new ArgoCD instance](#setting-up-a-new-argo-cd-instance) +5. [Configure resource quota/requests for OpenShift GitOps workloads](#configure-resource-quotarequests-for-openshift-gitops-workloads) +6. [Running default Gitops workloads on Infrastructure Nodes](#running-default-gitops-workloads-on-infrastructure-nodes) +7. [Using NodeSelector and Tolerations in Default Instance of Openshift GitOps](#using-nodeselector-and-tolerations-in-default-instance-of-openshift-gitops) +8. [Monitoring](#monitoring) +9. [Logging](#logging) +10. [Prevent auto-reboot during Argo CD sync with machine configs](#prevent-auto-reboot-during-argo-cd-sync-with-machine-configs) +11. [Machine configs and Argo CD: Performance challenges](#machine-configs-and-argo-cd-performance-challenges) +12. [Health status of OpenShift resources](#health-status-of-openshift-resources) +13. [Upgrade GitOps Operator from v1.0.1 to v1.1.0 (GA)](#upgrade-gitops-operator-from-v101-to-v110-ga) +14. [Upgrade GitOps Operator from v1.1.2 to v1.2.0 (GA)](#upgrade-gitops-operator-from-v112-to-v120-ga) +15. [GitOps Monitoring Dashboards](#gitops-monitoring-dashboards) +16. [Integrate GitOps with Secrets Management](Integrate%20GitOps%20with%20Secrets%20Management.md) +17. [Using ApplicationSets](#using-applicationsets) ## Installing OpenShift GitOps @@ -109,7 +108,6 @@ $ oc get pods -n openshift-gitops NAME READY STATUS RESTARTS AGE cluster-65885cfb44-x6lx4 1/1 Running 0 55s gitops-plugin-58b577c9c9-p78xl 1/1 Running 0 55s -kam-84c7c688c7-5h6pz 1/1 Running 0 55s openshift-gitops-application-controller-0 1/1 Running 0 52s openshift-gitops-applicationset-controller-f66d47bc4-9rsd8 1/1 Running 0 52s openshift-gitops-dex-server-55f8c6c44-s9jcl 1/1 Running 0 51s @@ -240,18 +238,6 @@ Updating the following environment variables in the existing Subscription Object -## Getting started with GitOps Application Manager (kam) - -### Download the kam CLI - -![image alt text](assets/25.download_kam_cli.png) - -![image alt text](assets/26.kam_download_index.png) - - -### **Bootstrap a GitOps repository** - -[https://github.com/redhat-developer/kam/tree/master/docs/journey/day1](https://github.com/redhat-developer/kam/tree/master/docs/journey/day1) ## Setting up a new Argo CD instance @@ -721,7 +707,6 @@ OpenShift allows certain workloads installed by the OpenShift GitOps Operator to Note: Other Argo CD instances installed to user namespaces are not eligible to run on Infrastructure nodes. Follow the steps to move these default workloads to infrastructure node -* kam deployment * cluster deployment (backend service) * openshift-gitops-applicationset-controller deployment * openshift-gitops-dex-server deployment diff --git a/hack/non-olm-install/README.md b/hack/non-olm-install/README.md index 59739c6ee..dfd0e4585 100644 --- a/hack/non-olm-install/README.md +++ b/hack/non-olm-install/README.md @@ -74,7 +74,6 @@ The following environment variables can be set to configure various options for | **ARGOCD_REDIS_HA_PROXY_IMAGE** | Image override for Redis HA proxy component | `registry.redhat.io/openshift4/ose-haproxy-router:v4.12.0-202302280915.p0.g3065f65.assembly.stream` | | **BACKEND_IMAGE** | Image override for Backend component |`${OPERATOR_REGISTRY}/${OPERATOR_REGISTRY_ORG}/${IMAGE_PREFIX}gitops-rhel8:${GITOPS_OPERATOR_VER}`| | **GITOPS_CONSOLE_PLUGIN_IMAGE** | Image override for console plugin component | `${OPERATOR_REGISTRY}/${OPERATOR_REGISTRY_ORG}/${IMAGE_PREFIX}console-plugin-rhel8:${GITOPS_OPERATOR_VER}` | -| **KAM_IMAGE** | Image override for KAM component | `${OPERATOR_REGISTRY}/${OPERATOR_REGISTRY_ORG}/kam-delivery-rhel8:${GITOPS_OPERATOR_VER}` | #### Variables for Operator parameters diff --git a/hack/non-olm-install/install-gitops-operator.sh b/hack/non-olm-install/install-gitops-operator.sh index 005f20caf..5243afc24 100755 --- a/hack/non-olm-install/install-gitops-operator.sh +++ b/hack/non-olm-install/install-gitops-operator.sh @@ -22,7 +22,6 @@ ARGOCD_DEX_IMAGE=${ARGOCD_DEX_IMAGE:-"${OPERATOR_REGISTRY}/${OPERATOR_REGISTRY_O ARGOCD_IMAGE=${ARGOCD_IMAGE:-"${OPERATOR_REGISTRY}/${OPERATOR_REGISTRY_ORG}/${IMAGE_PREFIX}argocd-rhel8:${GITOPS_OPERATOR_VER}"} BACKEND_IMAGE=${BACKEND_IMAGE:-"${OPERATOR_REGISTRY}/${OPERATOR_REGISTRY_ORG}/${IMAGE_PREFIX}gitops-rhel8:${GITOPS_OPERATOR_VER}"} GITOPS_CONSOLE_PLUGIN_IMAGE=${GITOPS_CONSOLE_PLUGIN_IMAGE:-"${OPERATOR_REGISTRY}/${OPERATOR_REGISTRY_ORG}/${IMAGE_PREFIX}console-plugin-rhel8:${GITOPS_OPERATOR_VER}"} -KAM_IMAGE=${KAM_IMAGE:-"${OPERATOR_REGISTRY}/${OPERATOR_REGISTRY_ORG}/${IMAGE_PREFIX}kam-delivery-rhel8:${GITOPS_OPERATOR_VER}"} # other images ARGOCD_KEYCLOAK_IMAGE=${ARGOCD_KEYCLOAK_IMAGE:-"registry.redhat.io/rh-sso-7/sso76-openshift-rhel8:7.6-32"} @@ -221,8 +220,6 @@ spec: value: ${ARGOCD_REDIS_HA_PROXY_IMAGE} - name: GITOPS_CONSOLE_PLUGIN_IMAGE value: ${GITOPS_CONSOLE_PLUGIN_IMAGE} - - name: KAM_IMAGE - value: ${KAM_IMAGE} - name: ARGOCD_CLUSTER_CONFIG_NAMESPACES value: \"${ARGOCD_CLUSTER_CONFIG_NAMESPACES}\" - name: CONTROLLER_CLUSTER_ROLE @@ -291,7 +288,6 @@ function extract_component_images_from_bundle_image() { ARGOCD_REDIS_HA_PROXY_IMAGE=$(cat "${WORK_DIR}"/container.yaml | ${YQ} '.env[] | select(.name=="ARGOCD_REDIS_HA_PROXY_IMAGE").value') BACKEND_IMAGE=$(cat "${WORK_DIR}"/container.yaml | ${YQ} '.env[] | select(.name=="BACKEND_IMAGE").value') GITOPS_CONSOLE_PLUGIN_IMAGE=$(cat "${WORK_DIR}"/container.yaml | ${YQ} '.env[] | select(.name=="GITOPS_CONSOLE_PLUGIN_IMAGE").value') - KAM_IMAGE=$(cat "${WORK_DIR}"/container.yaml | ${YQ} '.env[] | select(.name=="KAM_IMAGE").value') } # Initialize a temporary work directory to store the artifacts and @@ -436,7 +432,6 @@ function print_info() { echo "ARGOCD_REDIS_HA_PROXY_IMAGE: ${ARGOCD_REDIS_HA_PROXY_IMAGE}" echo "BACKEND_IMAGE: ${BACKEND_IMAGE}" echo "GITOPS_CONSOLE_PLUGIN_IMAGE: ${GITOPS_CONSOLE_PLUGIN_IMAGE}" - echo "KAM_IMAGE: ${KAM_IMAGE}" echo "" echo "Operator configurations:" diff --git a/scripts/openshift-CI-kuttl-tests.sh b/scripts/openshift-CI-kuttl-tests.sh index 03e58dd41..d375e2ea0 100755 --- a/scripts/openshift-CI-kuttl-tests.sh +++ b/scripts/openshift-CI-kuttl-tests.sh @@ -20,7 +20,7 @@ cp $KUBECONFIG /go/src/github.com/redhat-developer/gitops-operator/kubeconfig # Ensuring proper installation pod=openshift-gitops-operator-controller-manager && oc get pods `oc get pods --all-namespaces | grep $pod | head -1 | awk '{print $2}'` -n openshift-gitops-operator -o yaml subscription=gitops-operator- && oc get subscription `oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` -n openshift-gitops-operator -oc wait --for=condition=Ready -n openshift-gitops pod --timeout=15m -l 'app.kubernetes.io/name in (cluster,kam,openshift-gitops-application-controller,openshift-gitops-applicationset-controller,openshift-gitops-dex-server,openshift-gitops-redis,openshift-gitops-repo-server,openshift-gitops-server)' +oc wait --for=condition=Ready -n openshift-gitops pod --timeout=15m -l 'app.kubernetes.io/name in (cluster,openshift-gitops-application-controller,openshift-gitops-applicationset-controller,openshift-gitops-dex-server,openshift-gitops-redis,openshift-gitops-repo-server,openshift-gitops-server)' # Check argocd instance creation oc create ns test-argocd diff --git a/scripts/openshift-interop-kuttl-tests.sh b/scripts/openshift-interop-kuttl-tests.sh index c8c7097f9..703f15688 100755 --- a/scripts/openshift-interop-kuttl-tests.sh +++ b/scripts/openshift-interop-kuttl-tests.sh @@ -19,7 +19,7 @@ cp $KUBECONFIG /go/src/github.com/redhat-developer/gitops-operator/kubeconfig # Ensuring proper installation pod=openshift-gitops-operator-controller-manager && oc get pods `oc get pods --all-namespaces | grep $pod | head -1 | awk '{print $2}'` -n openshift-gitops-operator -o yaml oc get subscription -n openshift-gitops-operator -oc wait --for=condition=Ready -n openshift-gitops pod --timeout=15m -l 'app.kubernetes.io/name in (cluster,kam,openshift-gitops-application-controller,openshift-gitops-applicationset-controller,openshift-gitops-dex-server,openshift-gitops-redis,openshift-gitops-repo-server,openshift-gitops-server)' +oc wait --for=condition=Ready -n openshift-gitops pod --timeout=15m -l 'app.kubernetes.io/name in (cluster,openshift-gitops-application-controller,openshift-gitops-applicationset-controller,openshift-gitops-dex-server,openshift-gitops-redis,openshift-gitops-repo-server,openshift-gitops-server)' # Check argocd instance creation oc create ns test-argocd diff --git a/test/e2e/gitopsservice_test.go b/test/e2e/gitopsservice_test.go index b6632afb2..440138ec2 100644 --- a/test/e2e/gitopsservice_test.go +++ b/test/e2e/gitopsservice_test.go @@ -39,7 +39,6 @@ import ( . "github.com/onsi/gomega" osappsv1 "github.com/openshift/api/apps/v1" configv1 "github.com/openshift/api/config/v1" - console "github.com/openshift/api/console/v1" routev1 "github.com/openshift/api/route/v1" templatev1 "github.com/openshift/api/template/v1" pipelinesv1alpha1 "github.com/redhat-developer/gitops-operator/api/v1alpha1" @@ -124,32 +123,6 @@ var _ = Describe("GitOpsServiceController", func() { }) }) - Context("Check if kam resources are created", func() { - name := "kam" - It("Deployment that hosts kam is created", func() { - checkIfPresent(types.NamespacedName{Name: name, Namespace: argoCDNamespace}, &appsv1.Deployment{}) - }) - - It("Service that serves kam is created", func() { - checkIfPresent(types.NamespacedName{Name: name, Namespace: argoCDNamespace}, &corev1.Service{}) - }) - - It("Console CLI download resource that adds kam route to OpenShift's CLI download page is created", func() { - - By("route that serves kam is created") - route := &routev1.Route{} - checkIfPresent(types.NamespacedName{Name: name, Namespace: argoCDNamespace}, route) - - By("CLI download link is created") - consoleCLIDownload := &console.ConsoleCLIDownload{} - checkIfPresent(types.NamespacedName{Name: name}, consoleCLIDownload) - - By("CLI download link should match the kam route") - consoleCLILink := strings.TrimLeft(consoleCLIDownload.Spec.Links[0].Href, "https://") - Expect(route.Spec.Host + "/kam/").Should(Equal(consoleCLILink)) - }) - }) - Context("Validate machine config updates", func() { BeforeEach(func() { imageYAML := filepath.Join("..", "appcrs", "image_appcr.yaml") diff --git a/test/nondefaulte2e/gitops_service_nondefault_test.go b/test/nondefaulte2e/gitops_service_nondefault_test.go index 6fd9fd678..232be14ef 100644 --- a/test/nondefaulte2e/gitops_service_nondefault_test.go +++ b/test/nondefaulte2e/gitops_service_nondefault_test.go @@ -24,7 +24,6 @@ import ( argoapp "github.com/argoproj-labs/argocd-operator/api/v1beta1" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - routev1 "github.com/openshift/api/route/v1" monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" "github.com/redhat-developer/gitops-operator/common" @@ -46,19 +45,12 @@ var _ = Describe("GitOpsServiceNoDefaultInstall", func() { }, } - It("Backend and kam resources are created in 'openshift-gitops' namespace", func() { + It("Backend resources are created in 'openshift-gitops' namespace", func() { resourceList := []helper.ResourceList{ { Resource: &appsv1.Deployment{}, ExpectedResources: []string{ "cluster", - "kam", - }, - }, - { - Resource: &routev1.Route{}, - ExpectedResources: []string{ - "kam", }, }, } diff --git a/test/openshift/e2e/ignore-tests/parallel/1-090_validate_permissions/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-090_validate_permissions/01-assert.yaml index aa335f94a..8164738a2 100644 --- a/test/openshift/e2e/ignore-tests/parallel/1-090_validate_permissions/01-assert.yaml +++ b/test/openshift/e2e/ignore-tests/parallel/1-090_validate_permissions/01-assert.yaml @@ -114,9 +114,7 @@ spec: target OpenShift and Kubernetes clusters\n* Support for the Helm and Kustomize templating tools\n* Configuration drift detection and visualization on live clusters\n* Audit trails of rollouts to the clusters\n* Monitoring and logging integration - with OpenShift\n* Automated GitOps bootstrapping using Tekton and Argo CD with - [GitOps Application Manager CLI](https://github.com/redhat-developer/kam)\n\n## - Components\n* Argo CD 2.7.6\n* GitOps Application Manager CLI ([download](https://github.com/redhat-developer/kam/releases))\n\n## + with OpenShift\n##Components\n* Argo CD 2.7.6\n\n## How to Install \nAfter installing the OpenShift GitOps operator, an instance of Argo CD is installed in the `openshift-gitops` namespace which has sufficent privileges for managing cluster configurations. You can create additional Argo CD instances @@ -889,11 +887,6 @@ spec: - devtools - gitops - pipelines - links: - - name: Day 1 Operations - url: https://github.com/redhat-developer/kam/tree/master/docs/journey/day1 - - name: Day 2 Operations - url: https://github.com/redhat-developer/kam/tree/master/docs/journey/day2 maintainers: - email: shbose@redhat.com name: shoubhik diff --git a/test/openshift/e2e/ignore-tests/sequential/1-001_validate_kam_service/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-001_validate_kam_service/01-assert.yaml deleted file mode 100644 index e7697a0b7..000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-001_validate_kam_service/01-assert.yaml +++ /dev/null @@ -1,40 +0,0 @@ -# We need the openshift-gitops namespace installed by default -apiVersion: v1 -kind: Namespace -metadata: - name: openshift-gitops ---- -# We need a `kam` deployment in the namespace -apiVersion: apps/v1 -kind: Deployment -metadata: - name: kam - namespace: openshift-gitops -status: - replicas: 1 - readyReplicas: 1 ---- -# Route to kam exists and is properly configured -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: kam - namespace: openshift-gitops -spec: - port: - targetPort: 8443 - tls: - insecureEdgeTerminationPolicy: None - termination: passthrough - to: - kind: Service - name: kam - weight: 100 - wildcardPolicy: None ---- -# Service for kam exists -apiVersion: v1 -kind: Service -metadata: - name: kam - namespace: openshift-gitops \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-001_validate_kam_service/01-check-kam-service.yaml b/test/openshift/e2e/ignore-tests/sequential/1-001_validate_kam_service/01-check-kam-service.yaml deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/openshift/e2e/ignore-tests/sequential/1-001_validate_kam_service/02-check-route.yaml b/test/openshift/e2e/ignore-tests/sequential/1-001_validate_kam_service/02-check-route.yaml deleted file mode 100644 index adbaee824..000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-001_validate_kam_service/02-check-route.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# Check the route for kam in depth -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - status=$(oc get -n openshift-gitops route kam -o json | jq -r .status) - route_admitted=$(echo "$status" | jq -r '.ingress[0].conditions[0].type') - route_status=$(echo "$status" | jq -r '.ingress[0].conditions[0].status') - route_host=$(echo "$status" | jq -r '.ingress[0].host') - router_name=$(echo "$status" | jq -r '.ingress[0].routerName') - route_wildcard_policy=$(echo "$status" | jq -r '.ingress[0].wildcardPolicy') - if test "$route_admitted" != "Admitted" -o "$route_status" != "True"; then - echo "Route not ready" - exit 1 - fi - if test "$route_host" = ""; then - echo "Route has no host" - exit 1 - fi - if test "$router_name" != "default"; then - echo "Router is not default" - exit 1 - fi - if test "$route_wildcard_policy" != "None"; then - echo "Route wildcard policy is not None" - exit 1 - fi - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-001_validate_kam_service/03-check-download.yaml b/test/openshift/e2e/ignore-tests/sequential/1-001_validate_kam_service/03-check-download.yaml deleted file mode 100644 index 704819085..000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-001_validate_kam_service/03-check-download.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# Download all kam binaries from the URL in the host -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -timeout: 120 -commands: -- script: | - set -e - base_url=$(oc get -n openshift-gitops route kam -o json | jq -r '.status.ingress[0].host') - curl -k --silent -o/dev/null "${base_url}/kam/kam_linux_amd64" - curl -k --silent -o/dev/null "${base_url}/kam/kam_darwin_amd64" - curl -k --silent -o/dev/null "${base_url}/kam/kam_windows_amd64.exe" \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/01-assert.yaml index debf2ed63..6d1dc202f 100644 --- a/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/01-assert.yaml +++ b/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/01-assert.yaml @@ -46,9 +46,3 @@ metadata: name: cluster namespace: openshift-gitops --- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: kam - namespace: openshift-gitops ---- diff --git a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/01-assert.yaml index 7deb1cb39..a6eded59e 100644 --- a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/01-assert.yaml +++ b/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/01-assert.yaml @@ -19,21 +19,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - name: kam - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment metadata: name: openshift-gitops-server namespace: openshift-gitops diff --git a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/errors.yaml index f2f1535c8..277cccd59 100644 --- a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/errors.yaml +++ b/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/errors.yaml @@ -15,21 +15,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - name: kam - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment metadata: name: openshift-gitops-server namespace: openshift-gitops diff --git a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/01-assert.yaml index d1e8aeddd..d10a97921 100644 --- a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/01-assert.yaml +++ b/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/01-assert.yaml @@ -11,17 +11,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - name: kam - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux ---- -apiVersion: apps/v1 -kind: Deployment metadata: name: openshift-gitops-server namespace: openshift-gitops diff --git a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/02-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/02-assert.yaml index bf9fd3e48..1b6b57cd8 100644 --- a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/02-assert.yaml +++ b/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/02-assert.yaml @@ -12,18 +12,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - name: kam - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 ---- -apiVersion: apps/v1 -kind: Deployment metadata: name: openshift-gitops-server namespace: openshift-gitops diff --git a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/03-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/03-assert.yaml index aaf17f620..6069bc97a 100644 --- a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/03-assert.yaml +++ b/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/03-assert.yaml @@ -17,23 +17,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - name: kam - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment metadata: name: openshift-gitops-server namespace: openshift-gitops diff --git a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/04-errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/04-errors.yaml index aaf17f620..6069bc97a 100644 --- a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/04-errors.yaml +++ b/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/04-errors.yaml @@ -17,23 +17,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - name: kam - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment metadata: name: openshift-gitops-server namespace: openshift-gitops diff --git a/test/openshift/e2e/sequential/1-001_validate_kam_service/01-assert.yaml b/test/openshift/e2e/sequential/1-001_validate_kam_service/01-assert.yaml deleted file mode 100644 index e7697a0b7..000000000 --- a/test/openshift/e2e/sequential/1-001_validate_kam_service/01-assert.yaml +++ /dev/null @@ -1,40 +0,0 @@ -# We need the openshift-gitops namespace installed by default -apiVersion: v1 -kind: Namespace -metadata: - name: openshift-gitops ---- -# We need a `kam` deployment in the namespace -apiVersion: apps/v1 -kind: Deployment -metadata: - name: kam - namespace: openshift-gitops -status: - replicas: 1 - readyReplicas: 1 ---- -# Route to kam exists and is properly configured -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: kam - namespace: openshift-gitops -spec: - port: - targetPort: 8443 - tls: - insecureEdgeTerminationPolicy: None - termination: passthrough - to: - kind: Service - name: kam - weight: 100 - wildcardPolicy: None ---- -# Service for kam exists -apiVersion: v1 -kind: Service -metadata: - name: kam - namespace: openshift-gitops \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-001_validate_kam_service/01-check-kam-service.yaml b/test/openshift/e2e/sequential/1-001_validate_kam_service/01-check-kam-service.yaml deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/openshift/e2e/sequential/1-001_validate_kam_service/02-check-route.yaml b/test/openshift/e2e/sequential/1-001_validate_kam_service/02-check-route.yaml deleted file mode 100644 index adbaee824..000000000 --- a/test/openshift/e2e/sequential/1-001_validate_kam_service/02-check-route.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# Check the route for kam in depth -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - status=$(oc get -n openshift-gitops route kam -o json | jq -r .status) - route_admitted=$(echo "$status" | jq -r '.ingress[0].conditions[0].type') - route_status=$(echo "$status" | jq -r '.ingress[0].conditions[0].status') - route_host=$(echo "$status" | jq -r '.ingress[0].host') - router_name=$(echo "$status" | jq -r '.ingress[0].routerName') - route_wildcard_policy=$(echo "$status" | jq -r '.ingress[0].wildcardPolicy') - if test "$route_admitted" != "Admitted" -o "$route_status" != "True"; then - echo "Route not ready" - exit 1 - fi - if test "$route_host" = ""; then - echo "Route has no host" - exit 1 - fi - if test "$router_name" != "default"; then - echo "Router is not default" - exit 1 - fi - if test "$route_wildcard_policy" != "None"; then - echo "Route wildcard policy is not None" - exit 1 - fi - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-001_validate_kam_service/03-check-download.yaml b/test/openshift/e2e/sequential/1-001_validate_kam_service/03-check-download.yaml deleted file mode 100644 index 704819085..000000000 --- a/test/openshift/e2e/sequential/1-001_validate_kam_service/03-check-download.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# Download all kam binaries from the URL in the host -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -timeout: 120 -commands: -- script: | - set -e - base_url=$(oc get -n openshift-gitops route kam -o json | jq -r '.status.ingress[0].host') - curl -k --silent -o/dev/null "${base_url}/kam/kam_linux_amd64" - curl -k --silent -o/dev/null "${base_url}/kam/kam_darwin_amd64" - curl -k --silent -o/dev/null "${base_url}/kam/kam_windows_amd64.exe" \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/01-assert.yaml b/test/openshift/e2e/sequential/1-028_validate_run_on_infra/01-assert.yaml index 7deb1cb39..a6eded59e 100644 --- a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/01-assert.yaml +++ b/test/openshift/e2e/sequential/1-028_validate_run_on_infra/01-assert.yaml @@ -19,21 +19,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - name: kam - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment metadata: name: openshift-gitops-server namespace: openshift-gitops diff --git a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/errors.yaml b/test/openshift/e2e/sequential/1-028_validate_run_on_infra/errors.yaml index f2f1535c8..277cccd59 100644 --- a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/errors.yaml +++ b/test/openshift/e2e/sequential/1-028_validate_run_on_infra/errors.yaml @@ -15,21 +15,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - name: kam - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment metadata: name: openshift-gitops-server namespace: openshift-gitops diff --git a/test/openshift/e2e/sequential/1-071_validate_node_selectors/01-assert.yaml b/test/openshift/e2e/sequential/1-071_validate_node_selectors/01-assert.yaml index d1e8aeddd..d10a97921 100644 --- a/test/openshift/e2e/sequential/1-071_validate_node_selectors/01-assert.yaml +++ b/test/openshift/e2e/sequential/1-071_validate_node_selectors/01-assert.yaml @@ -11,17 +11,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - name: kam - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux ---- -apiVersion: apps/v1 -kind: Deployment metadata: name: openshift-gitops-server namespace: openshift-gitops diff --git a/test/openshift/e2e/sequential/1-071_validate_node_selectors/02-assert.yaml b/test/openshift/e2e/sequential/1-071_validate_node_selectors/02-assert.yaml index bf9fd3e48..1b6b57cd8 100644 --- a/test/openshift/e2e/sequential/1-071_validate_node_selectors/02-assert.yaml +++ b/test/openshift/e2e/sequential/1-071_validate_node_selectors/02-assert.yaml @@ -12,18 +12,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - name: kam - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 ---- -apiVersion: apps/v1 -kind: Deployment metadata: name: openshift-gitops-server namespace: openshift-gitops diff --git a/test/openshift/e2e/sequential/1-071_validate_node_selectors/03-assert.yaml b/test/openshift/e2e/sequential/1-071_validate_node_selectors/03-assert.yaml index aaf17f620..6069bc97a 100644 --- a/test/openshift/e2e/sequential/1-071_validate_node_selectors/03-assert.yaml +++ b/test/openshift/e2e/sequential/1-071_validate_node_selectors/03-assert.yaml @@ -17,23 +17,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - name: kam - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment metadata: name: openshift-gitops-server namespace: openshift-gitops diff --git a/test/openshift/e2e/sequential/1-071_validate_node_selectors/04-errors.yaml b/test/openshift/e2e/sequential/1-071_validate_node_selectors/04-errors.yaml index aaf17f620..6069bc97a 100644 --- a/test/openshift/e2e/sequential/1-071_validate_node_selectors/04-errors.yaml +++ b/test/openshift/e2e/sequential/1-071_validate_node_selectors/04-errors.yaml @@ -17,23 +17,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - name: kam - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment metadata: name: openshift-gitops-server namespace: openshift-gitops