mirror of
				https://github.com/1Password/onepassword-operator.git
				synced 2025-10-31 11:49:40 +00:00 
			
		
		
		
	 cabc020cc6
			
		
	
	cabc020cc6
	
	
	
		
			
			* Add missing improvements from Operator SDK 1.34.1 These were not mentioned in the upgrade documentation for version 1.34.x (https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.34.0/), but I've found them by compating the release with the previous one (https://github.com/operator-framework/operator-sdk/compare/v1.33.0...v1.34.1). * Upgrade to Operator SDK 1.36.0 Source of upgrade steps: https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.36.0/ Key differences: - Go packages `k8s.io/*` are already at a version higher than the one in the upgrade. - `ENVTEST_K8S_VERSION` is at a version higher than the one in the upgrade - We didn't have the golangci-lint make command before, thus we only needed to add things. * Upgrade to Operator SDK 1.38.0 Source of upgrade steps: https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.38.0/ * Upgrade to Operator SDK 1.39.0 Source of upgrade steps: https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.39.0/ * Upgrade to Operator SDK 1.40.0 Source of upgrade steps: https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.40.0/ I didn't do the "Add app.kubernetes.io/name label to your manifests" since it seems that we have it already, and it's customized. * Address lint errors * Update golangci-lint version used to support Go 1.24 * Improve workflows - Make workflow targets more specific. - Make build workflow only build (i.e. remove test part of it). - Rearrange steps and improve naming for build workflow. * Add back deleted test Initially the test has been removed due to lint saying that it was duplicate code, but it falsely errored since the values are different. * Improve code and add missing upgrade pieces * Upgrade to Operator SDK 1.41.1 Source of upgrade steps: https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.41.0/ Upgrading to 1.41.1 from 1.40.0 doesn't have any migration steps. Key elements: - Upgrade to golangci-lint v2 - Made the manifests using the updated controller tools * Address linter errors golanci-lint v2 seems to be more robust than the previous one, which is beneficial. Thus, we address the linter errors thrown by v2 and improve our code even further. * Add Makefile improvements These were brought in by comparing the Makefile of a freshly created operator using the latest operator-sdk with ours. * Add missing default kustomization for 1.40.0 upgrade * Bring default kustomization to latest version This is done by putting the file's content from a newly-generated operator. * Switch metrics-bind-address default value back to 8080 This ensures that the upgrade is backwards-compatible. * Add webhook-related scaffolding This enables us to easily add support for webhooks by running `operator-sdk create webhook` whenever we want to add them. * Fix typo
		
			
				
	
	
		
			139 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			139 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| package onepassword
 | |
| 
 | |
| import (
 | |
| 	"context"
 | |
| 	"os"
 | |
| 
 | |
| 	appsv1 "k8s.io/api/apps/v1"
 | |
| 	corev1 "k8s.io/api/core/v1"
 | |
| 	"k8s.io/apimachinery/pkg/api/errors"
 | |
| 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 | |
| 	"k8s.io/apimachinery/pkg/types"
 | |
| 	"k8s.io/apimachinery/pkg/util/yaml"
 | |
| 	"sigs.k8s.io/controller-runtime/pkg/client"
 | |
| 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 | |
| )
 | |
| 
 | |
| var logConnectSetup = logf.Log.WithName("ConnectSetup")
 | |
| var deploymentPath = "../config/connect/deployment.yaml"
 | |
| var servicePath = "../config/connect/service.yaml"
 | |
| 
 | |
| func SetupConnect(ctx context.Context, kubeClient client.Client, deploymentNamespace string) error {
 | |
| 	err := setupService(ctx, kubeClient, servicePath, deploymentNamespace)
 | |
| 	if err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	err = setupDeployment(ctx, kubeClient, deploymentPath, deploymentNamespace)
 | |
| 	if err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| func setupDeployment(
 | |
| 	ctx context.Context,
 | |
| 	kubeClient client.Client,
 | |
| 	deploymentPath string,
 | |
| 	deploymentNamespace string,
 | |
| ) error {
 | |
| 	existingDeployment := &appsv1.Deployment{}
 | |
| 
 | |
| 	// check if deployment has already been created
 | |
| 	err := kubeClient.Get(ctx, types.NamespacedName{
 | |
| 		Name:      "onepassword-connect",
 | |
| 		Namespace: deploymentNamespace,
 | |
| 	}, existingDeployment)
 | |
| 	if err != nil {
 | |
| 		if errors.IsNotFound(err) {
 | |
| 			logConnectSetup.Info("No existing Connect deployment found. Creating Deployment")
 | |
| 			return createDeployment(ctx, kubeClient, deploymentPath, deploymentNamespace)
 | |
| 		}
 | |
| 	}
 | |
| 	return err
 | |
| }
 | |
| 
 | |
| func createDeployment(
 | |
| 	ctx context.Context,
 | |
| 	kubeClient client.Client,
 | |
| 	deploymentPath string,
 | |
| 	deploymentNamespace string,
 | |
| ) error {
 | |
| 	deployment, err := getDeploymentToCreate(deploymentPath, deploymentNamespace)
 | |
| 	if err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	err = kubeClient.Create(ctx, deployment)
 | |
| 	if err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| func getDeploymentToCreate(deploymentPath string, deploymentNamespace string) (*appsv1.Deployment, error) {
 | |
| 	f, err := os.Open(deploymentPath)
 | |
| 	if err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 	deployment := &appsv1.Deployment{
 | |
| 		ObjectMeta: v1.ObjectMeta{
 | |
| 			Namespace: deploymentNamespace,
 | |
| 		},
 | |
| 	}
 | |
| 
 | |
| 	err = yaml.NewYAMLOrJSONDecoder(f, 4096).Decode(deployment)
 | |
| 	if err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 	return deployment, nil
 | |
| }
 | |
| 
 | |
| func setupService(ctx context.Context, kubeClient client.Client, servicePath string, deploymentNamespace string) error {
 | |
| 	existingService := &corev1.Service{}
 | |
| 
 | |
| 	// check if service has already been created
 | |
| 	err := kubeClient.Get(ctx, types.NamespacedName{
 | |
| 		Name:      "onepassword-connect",
 | |
| 		Namespace: deploymentNamespace,
 | |
| 	}, existingService)
 | |
| 	if err != nil {
 | |
| 		if errors.IsNotFound(err) {
 | |
| 			logConnectSetup.Info("No existing Connect service found. Creating Service")
 | |
| 			return createService(ctx, kubeClient, servicePath, deploymentNamespace)
 | |
| 		}
 | |
| 	}
 | |
| 	return err
 | |
| }
 | |
| 
 | |
| func createService(
 | |
| 	ctx context.Context,
 | |
| 	kubeClient client.Client,
 | |
| 	servicePath string,
 | |
| 	deploymentNamespace string,
 | |
| ) error {
 | |
| 	f, err := os.Open(servicePath)
 | |
| 	if err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 	service := &corev1.Service{
 | |
| 		ObjectMeta: v1.ObjectMeta{
 | |
| 			Namespace: deploymentNamespace,
 | |
| 		},
 | |
| 	}
 | |
| 
 | |
| 	err = yaml.NewYAMLOrJSONDecoder(f, 4096).Decode(service)
 | |
| 	if err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	err = kubeClient.Create(ctx, service)
 | |
| 	if err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	return nil
 | |
| }
 |