From c877f2d01650d6f6a52539050898f5c7013f7587 Mon Sep 17 00:00:00 2001 From: Vaibhav Sethi Date: Mon, 16 Dec 2024 14:17:41 +0000 Subject: [PATCH] Bump golang version to 1.23 --- .github/workflows/go.yml | 2 +- Dockerfile | 2 +- Makefile | 4 +- controllers/testdata/appfabric.json | 5 - controllers/testdata/appfabricprocessor.json | 406 ++++++++++++++++++ controllers/testdata/cdap_master_cr.json | 12 + controllers/utils_test.go | 68 +-- go.mod | 2 +- go.sum | 5 + .../sigs.k8s.io/controller-reconciler/go.mod | 2 +- .../sigs.k8s.io/controller-reconciler/go.sum | 2 + webhooks/cdap_webhook.go | 4 +- 12 files changed, 469 insertions(+), 45 deletions(-) create mode 100644 controllers/testdata/appfabricprocessor.json diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index b229c750..aa40f0ab 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.21 + go-version: 1.23 - name: Install Kubebuilder run: | diff --git a/Dockerfile b/Dockerfile index c3ef604a..caa43ad4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.19 as builder +FROM golang:1.23 as builder # Copy everything in the go src WORKDIR /go/src/cdap.io/cdap-operator diff --git a/Makefile b/Makefile index 3c9091ee..48247608 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # Image URL to use all building/pushing image targets IMG ?= controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. -ENVTEST_K8S_VERSION = 1.22 +ENVTEST_K8S_VERSION = 1.30 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) @@ -113,7 +113,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest ## Tool Versions KUSTOMIZE_VERSION ?= v3.8.7 -CONTROLLER_TOOLS_VERSION ?= v0.7.0 +CONTROLLER_TOOLS_VERSION ?= v0.16.5 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize diff --git a/controllers/testdata/appfabric.json b/controllers/testdata/appfabric.json index efd1c5bc..7790ad22 100644 --- a/controllers/testdata/appfabric.json +++ b/controllers/testdata/appfabric.json @@ -151,11 +151,6 @@ "name": "cdap-sysappconf", "readOnly": true }, - { - "mountPath": "/data", - "name": "cdap-test-appfabric-data", - "readOnly": true - }, { "mountPath": "/etc/cdap/security", "name": "cdap-security", diff --git a/controllers/testdata/appfabricprocessor.json b/controllers/testdata/appfabricprocessor.json new file mode 100644 index 00000000..d933ed12 --- /dev/null +++ b/controllers/testdata/appfabricprocessor.json @@ -0,0 +1,406 @@ +{ + "apiVersion": "apps/v1", + "kind": "StatefulSet", + "metadata": { + "annotations": { + "deployment.kubernetes.io/revision": "8" + }, + "creationTimestamp": null, + "generation": 535, + "labels": { + "cdap.container.AppFabricProcessor": "test", + "cdap.instance": "test", + "custom-resource": "v1alpha1.CDAPMaster", + "custom-resource-name": "test", + "custom-resource-namespace": "default", + "using": "controllers.ServiceHandler" + }, + "name": "cdap-test-appfabricprocessor", + "namespace": "default", + "ownerReferences": [ + { + "apiVersion": "cdap.cdap.io/v1alpha1", + "blockOwnerDeletion": true, + "controller": true, + "kind": "CDAPMaster", + "name": "test", + "uid": "7aeaad53-4afe-11ea-8611-42010a800022" + } + ], + "resourceVersion": "1912414", + "selfLink": "/apis/extensions/v1beta1/namespaces/default/deployments/cdap-test-appfabric", + "uid": "7b7154a1-4afe-11ea-8611-42010a800022" + }, + "spec": { + "progressDeadlineSeconds": 600, + "replicas": 1, + "revisionHistoryLimit": 10, + "selector": { + "matchLabels": { + "cdap.container.AppFabricProcessor": "test", + "cdap.instance": "test", + "custom-resource": "v1alpha1.CDAPMaster", + "custom-resource-name": "test", + "custom-resource-namespace": "default", + "using": "controllers.ServiceHandler" + } + }, + "strategy": { + "rollingUpdate": { + "maxSurge": "25%", + "maxUnavailable": "25%" + }, + "type": "RollingUpdate" + }, + "serviceName": "cdap-test-appfabricprocessor", + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "cdap.container.AppFabricProcessor": "test", + "cdap.instance": "test", + "custom-resource": "v1alpha1.CDAPMaster", + "custom-resource-name": "test", + "custom-resource-namespace": "default", + "using": "controllers.ServiceHandler" + } + }, + "spec": { + "affinity": { + "podAntiAffinity": { + "preferredDuringSchedulingIgnoredDuringExecution": [ + { + "weight": 100, + "podAffinityTerm": { + "labelSelector": { + "matchExpressions": [ + { + "key": "security", + "operator": "In", + "values": ["S2"] + } + ] + }, + "topologyKey": "topology.kubernetes.io/zone" + } + } + ] + } + }, + "containers": [ + { + "args": [ + "io.cdap.cdap.master.environment.k8s.AppFabricProcessorServiceMain", + "--env=k8s" + ], + "env": [ + { + "name": "all-services-test", + "value": "some-value" + }, + { + "name": "JAVA_HEAPMAX", + "value": "-Xmx1291845632" + } + ], + "image": "gcr.io/cloud-data-fusion-images/cloud-data-fusion:6.1.0.5", + "imagePullPolicy": "IfNotPresent", + "name": "appfabricprocessor", + "resources": { + "requests": { + "cpu": "2", + "memory": "2000Mi" + } + }, + "securityContext": { + "allowPrivilegeEscalation": false, + "privileged": false, + "readOnlyRootFilesystem": false + }, + "lifecycle": { + "preStop": { + "exec": { + "command": ["sh", "-c", "echo hello"] + } + } + }, + "terminationMessagePath": "/dev/termination-log", + "terminationMessagePolicy": "File", + "volumeMounts": [ + { + "mountPath": "/etc/podinfo", + "name": "podinfo", + "readOnly": true + }, + { + "mountPath": "/etc/cdap/conf", + "name": "cdap-conf", + "readOnly": true + }, + { + "mountPath": "/etc/hadoop/conf", + "name": "hadoop-conf", + "readOnly": true + }, + { + "mountPath": "/opt/cdap/master/system-app-config", + "name": "cdap-sysappconf", + "readOnly": true + }, + { + "mountPath": "/data", + "name": "cdap-test-appfabricprocessor-data", + "readOnly": true + }, + { + "mountPath": "/etc/cdap/security", + "name": "cdap-security", + "readOnly": true + }, + { + "name": "cdap-cm-vol-my-config-map-1", + "mountPath": "/my/config/map/1" + }, + { + "mountPath": "/my/config/map/2", + "name": "cdap-cm-vol-my-config-map-2" + }, + { + "mountPath": "/my/secret/1", + "name": "cdap-se-vol-my-secret-1" + }, + { + "mountPath": "/mnt/test", + "name": "test-volume", + "readOnly": true + }, + { + "mountPath": "/mnt/teststorage", + "name": "test-persistent-storage" + } + ] + } + ], + "initContainers": [ + { + "name": "storageinit", + "image": "gcr.io/cloud-data-fusion-images/cloud-data-fusion:6.1.0.5", + "args": ["io.cdap.cdap.master.environment.k8s.StorageMain"], + "resources": {}, + "volumeMounts": [ + { + "name": "podinfo", + "readOnly": true, + "mountPath": "/etc/podinfo" + }, + { + "name": "cdap-conf", + "readOnly": true, + "mountPath": "/etc/cdap/conf" + }, + { + "name": "hadoop-conf", + "readOnly": true, + "mountPath": "/etc/hadoop/conf" + }, + { + "name": "cdap-sysappconf", + "readOnly": true, + "mountPath": "/opt/cdap/master/system-app-config" + }, + { + "mountPath": "/data", + "name": "cdap-test-appfabricprocessor-data" + }, + { + "name": "cdap-security", + "readOnly": true, + "mountPath": "/etc/cdap/security" + }, + { + "mountPath": "/mnt/test", + "name": "test-volume", + "readOnly": true + }, + { + "mountPath": "/mnt/teststorage", + "name": "test-persistent-storage" + } + ] + } + ], + "dnsPolicy": "ClusterFirst", + "restartPolicy": "Always", + "schedulerName": "default-scheduler", + "securityContext": { + "fsGroup": 2000, + "runAsGroup": 1000, + "runAsUser": 1000, + "runAsNonRoot": true + }, + "serviceAccount": "cdap", + "serviceAccountName": "cdap", + "terminationGracePeriodSeconds": 120, + "volumes": [ + { + "downwardAPI": { + "defaultMode": 420, + "items": [ + { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.labels" + }, + "path": "pod.labels.properties" + }, + { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.name" + }, + "path": "pod.name" + }, + { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.uid" + }, + "path": "pod.uid" + } + ] + }, + "name": "podinfo" + }, + { + "configMap": { + "defaultMode": 420, + "name": "cdap-test-cconf" + }, + "name": "cdap-conf" + }, + { + "configMap": { + "defaultMode": 420, + "name": "cdap-test-hconf" + }, + "name": "hadoop-conf" + }, + { + "configMap": { + "defaultMode": 420, + "name": "cdap-test-sysappconf" + }, + "name": "cdap-sysappconf" + }, + { + "name": "cdap-security", + "secret": { + "defaultMode": 420, + "secretName": "cdap-secret" + } + }, + { + "name": "cdap-cm-vol-my-config-map-1", + "configMap": { + "defaultMode": 420, + "name": "my-config-map-1" + } + }, + { + "name": "cdap-cm-vol-my-config-map-2", + "configMap": { + "defaultMode": 420, + "name": "my-config-map-2" + } + }, + { + "name": "cdap-se-vol-my-secret-1", + "secret": { + "defaultMode": 420, + "secretName": "my-secret-1" + } + }, + { + "name": "test-volume", + "projected": { + "defaultMode": 420, + "sources": [ + { + "serviceAccountToken": { + "audience": "test-aud", + "expirationSeconds": 3600, + "path": "token" + } + }, + { + "configMap": { + "name": "test-projected-config", + "items": [ + { + "key": "config", + "path": "test-projected-config" + } + ], + "optional": false + } + } + ] + } + }, + { + "name": "test-persistent-storage", + "persistentVolumeClaim": { + "claimName": "test-persistent-volume-claim" + } + } + ] + } + }, + "updateStrategy": {}, + "volumeClaimTemplates": [ + { + "metadata": { + "name": "cdap-test-appfabricprocessor-data", + "creationTimestamp": null + }, + "spec": { + "accessModes": [ + "ReadWriteOnce" + ], + "resources": { + "requests": { + "storage": "200Gi" + } + } + }, + "status": {} + } + ] + }, + "status": { + "availableReplicas": 1, + "conditions": [ + { + "lastTransitionTime": "2020-02-09T05:39:28Z", + "lastUpdateTime": "2020-02-09T05:39:28Z", + "message": "Deployment has minimum availability.", + "reason": "MinimumReplicasAvailable", + "status": "True", + "type": "Available" + }, + { + "lastTransitionTime": "2020-02-09T05:39:04Z", + "lastUpdateTime": "2020-02-09T08:58:40Z", + "message": "ReplicaSet \"cdap-test-appfabric-5fdddcfcb4\" has successfully progressed.", + "reason": "NewReplicaSetAvailable", + "status": "True", + "type": "Progressing" + } + ], + "observedGeneration": 535, + "availableReplicas": 0, + "readyReplicas": 1, + "replicas": 0, + "updatedReplicas": 1 + } +} diff --git a/controllers/testdata/cdap_master_cr.json b/controllers/testdata/cdap_master_cr.json index 6147efae..960f1258 100644 --- a/controllers/testdata/cdap_master_cr.json +++ b/controllers/testdata/cdap_master_cr.json @@ -102,6 +102,18 @@ } } }, + "appfabricprocessor": { + "metadata": { + "creationTimestamp": null + }, + "resources": { + "requests": { + "cpu": "2000m", + "memory": "2000Mi" + } + }, + "storageSize": "200Gi" + }, "authentication": { "metadata": { "creationTimestamp": null diff --git a/controllers/utils_test.go b/controllers/utils_test.go index 743f9c60..3e6af1c9 100644 --- a/controllers/utils_test.go +++ b/controllers/utils_test.go @@ -18,44 +18,48 @@ var _ = Describe("Controller Suite", func() { BeforeEach(func() { master = &v1alpha1.CDAPMaster{} serviceToSpec = map[string]*v1alpha1.CDAPServiceSpec{ - serviceLogs: &master.Spec.Logs.CDAPServiceSpec, - serviceAppFabric: &master.Spec.AppFabric.CDAPServiceSpec, - serviceMetrics: &master.Spec.Metrics.CDAPServiceSpec, - serviceRouter: &master.Spec.Router.CDAPServiceSpec, - serviceMessaging: &master.Spec.Messaging.CDAPServiceSpec, - serviceMetadata: &master.Spec.Metadata.CDAPServiceSpec, - servicePreview: &master.Spec.Preview.CDAPServiceSpec, - serviceUserInterface: &master.Spec.UserInterface.CDAPServiceSpec, + serviceLogs: &master.Spec.Logs.CDAPServiceSpec, + serviceAppFabric: &master.Spec.AppFabric.CDAPServiceSpec, + serviceAppFabricProcessor: &master.Spec.AppFabricProcessor.CDAPServiceSpec, + serviceMetrics: &master.Spec.Metrics.CDAPServiceSpec, + serviceRouter: &master.Spec.Router.CDAPServiceSpec, + serviceMessaging: &master.Spec.Messaging.CDAPServiceSpec, + serviceMetadata: &master.Spec.Metadata.CDAPServiceSpec, + servicePreview: &master.Spec.Preview.CDAPServiceSpec, + serviceUserInterface: &master.Spec.UserInterface.CDAPServiceSpec, } serviceToScalableSpec = map[string]*v1alpha1.CDAPScalableServiceSpec{ - serviceLogs: nil, - serviceAppFabric: &master.Spec.AppFabric.CDAPScalableServiceSpec, - serviceMetrics: nil, - serviceRouter: &master.Spec.Router.CDAPScalableServiceSpec, - serviceMessaging: nil, - serviceMetadata: &master.Spec.Metadata.CDAPScalableServiceSpec, - servicePreview: nil, - serviceUserInterface: &master.Spec.UserInterface.CDAPScalableServiceSpec, + serviceLogs: nil, + serviceAppFabric: &master.Spec.AppFabric.CDAPScalableServiceSpec, + serviceAppFabricProcessor: nil, + serviceMetrics: nil, + serviceRouter: &master.Spec.Router.CDAPScalableServiceSpec, + serviceMessaging: nil, + serviceMetadata: &master.Spec.Metadata.CDAPScalableServiceSpec, + servicePreview: nil, + serviceUserInterface: &master.Spec.UserInterface.CDAPScalableServiceSpec, } serviceToStatefulSpec = map[string]*v1alpha1.CDAPStatefulServiceSpec{ - serviceLogs: &master.Spec.Logs.CDAPStatefulServiceSpec, - serviceAppFabric: nil, - serviceMetrics: &master.Spec.Metrics.CDAPStatefulServiceSpec, - serviceRouter: nil, - serviceMessaging: &master.Spec.Messaging.CDAPStatefulServiceSpec, - serviceMetadata: nil, - servicePreview: &master.Spec.Preview.CDAPStatefulServiceSpec, - serviceUserInterface: nil, + serviceLogs: &master.Spec.Logs.CDAPStatefulServiceSpec, + serviceAppFabric: nil, + serviceAppFabricProcessor: &master.Spec.AppFabricProcessor.CDAPStatefulServiceSpec, + serviceMetrics: &master.Spec.Metrics.CDAPStatefulServiceSpec, + serviceRouter: nil, + serviceMessaging: &master.Spec.Messaging.CDAPStatefulServiceSpec, + serviceMetadata: nil, + servicePreview: &master.Spec.Preview.CDAPStatefulServiceSpec, + serviceUserInterface: nil, } serviceToExternalSpec = map[string]*v1alpha1.CDAPExternalServiceSpec{ - serviceLogs: nil, - serviceAppFabric: nil, - serviceMetrics: nil, - serviceRouter: &master.Spec.Router.CDAPExternalServiceSpec, - serviceMessaging: nil, - serviceMetadata: nil, - servicePreview: nil, - serviceUserInterface: &master.Spec.UserInterface.CDAPExternalServiceSpec, + serviceLogs: nil, + serviceAppFabric: nil, + serviceAppFabricProcessor: nil, + serviceMetrics: nil, + serviceRouter: &master.Spec.Router.CDAPExternalServiceSpec, + serviceMessaging: nil, + serviceMetadata: nil, + servicePreview: nil, + serviceUserInterface: &master.Spec.UserInterface.CDAPExternalServiceSpec, } }) It("Successfully get pointer to CDAPServiceSpec", func() { diff --git a/go.mod b/go.mod index e0b624e3..d9afba57 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module cdap.io/cdap-operator -go 1.19 +go 1.23 require ( github.com/go-logr/logr v1.2.3 diff --git a/go.sum b/go.sum index 7a31b713..399e09b2 100644 --- a/go.sum +++ b/go.sum @@ -228,6 +228,7 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= @@ -256,6 +257,7 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU= +github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q= @@ -308,6 +310,7 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= @@ -326,6 +329,7 @@ go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= +go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= @@ -639,6 +643,7 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= diff --git a/vendor_old/sigs.k8s.io/controller-reconciler/go.mod b/vendor_old/sigs.k8s.io/controller-reconciler/go.mod index 344f11ea..3695cdd4 100644 --- a/vendor_old/sigs.k8s.io/controller-reconciler/go.mod +++ b/vendor_old/sigs.k8s.io/controller-reconciler/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/controller-reconciler -go 1.19 +go 1.23 require ( github.com/evanphx/json-patch v5.6.0+incompatible diff --git a/vendor_old/sigs.k8s.io/controller-reconciler/go.sum b/vendor_old/sigs.k8s.io/controller-reconciler/go.sum index ab924f00..1e16c320 100644 --- a/vendor_old/sigs.k8s.io/controller-reconciler/go.sum +++ b/vendor_old/sigs.k8s.io/controller-reconciler/go.sum @@ -401,6 +401,7 @@ github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= +github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= @@ -847,6 +848,7 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/webhooks/cdap_webhook.go b/webhooks/cdap_webhook.go index 5c89d62d..6005186d 100644 --- a/webhooks/cdap_webhook.go +++ b/webhooks/cdap_webhook.go @@ -18,8 +18,8 @@ import ( const ( labelInstanceKey = "cdap.instance" - // cdapMasterNamespaceKey is the label added by CDAP on pods launched by CDAP. - cdapMasterNamespaceKey = "cdap.k8s.namespace" + // cdapMasterNamespaceKey is the label added by CDAP on pods launched by CDAP. + cdapMasterNamespaceKey = "cdap.k8s.namespace" // customResourceNamespaceKey is the label added by controller-reconciler on resources // managed by the CDAP operator. customResourceNamespaceKey = "custom-resource-namespace"