diff --git a/.github/workflows/operator.yaml b/.github/workflows/operator.yaml index f6002f54..f2b0cdf6 100644 --- a/.github/workflows/operator.yaml +++ b/.github/workflows/operator.yaml @@ -33,11 +33,11 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: 1.21.4 - name: Setup Operator SDK run: | mkdir /tmp/operator-sdk - git clone -b v1.29.0 https://github.com/operator-framework/operator-sdk /tmp/operator-sdk + git clone -b v1.32.0 https://github.com/operator-framework/operator-sdk /tmp/operator-sdk cd /tmp/operator-sdk make install cd - diff --git a/Makefile b/Makefile index 8b4a7af4..ddbfc3b0 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) # Current Operator version -VERSION ?= main +VERSION ?= 6.1.0 # CHANNELS define the bundle channels used in the bundle. # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable") diff --git a/README.md b/README.md index 9cbd239b..8ca310f9 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,12 @@ The Carbon Black Cloud Container Operator utilizes the operator-framework to cre ## Compatibility Matrix -| Operator version | Kubernetes Sensor Component Version | Minimum Kubernetes Version | -|------------------|-------------------------------------|----------------------------| -| v6.0.x | 2.10.0, 2.11.0, 2.12.0, 3.0.X | 1.18 | -| v5.6.x | 2.10.0, 2.11.0, 2.12.0 | 1.16 | -| v5.5.x | 2.10.0, 2.11.0 | 1.16 | +| Operator version | Kubernetes Sensor Component Version | Minimum Kubernetes Version | +|------------------|--------------------------------------|----------------------------| +| v6.1.x | 2.10.0, 2.11.0, 2.12.0, 3.0.X, 3.1.X | 1.18 | +| v6.0.x | 2.10.0, 2.11.0, 2.12.0, 3.0.X, 3.1.X | 1.18 | +| v5.6.x | 2.10.0, 2.11.0, 2.12.0 | 1.16 | +| v5.5.x | 2.10.0, 2.11.0 | 1.16 | ## Operator Deployment @@ -27,7 +28,7 @@ Kubernetes 1.18+ is supported. ### From script: ``` -export OPERATOR_VERSION=v6.0.2 +export OPERATOR_VERSION=v6.1.0 export OPERATOR_SCRIPT_URL=https://setup.containers.carbonblack.io/$OPERATOR_VERSION/operator-apply.sh curl -s $OPERATOR_SCRIPT_URL | bash ``` @@ -92,7 +93,7 @@ spec: ### Uninstalling the Carbon Black Cloud Container Operator ```sh -export OPERATOR_VERSION=v6.0.2 +export OPERATOR_VERSION=v6.1.0 export OPERATOR_SCRIPT_URL=https://setup.containers.carbonblack.io/$OPERATOR_VERSION/operator-apply.sh curl -s $OPERATOR_SCRIPT_URL | bash -s -- -u ``` diff --git a/charts/cbcontainers-operator/cbcontainers-operator-chart/templates/deployment.yaml b/charts/cbcontainers-operator/cbcontainers-operator-chart/templates/deployment.yaml index acf78488..c4bf017a 100644 --- a/charts/cbcontainers-operator/cbcontainers-operator-chart/templates/deployment.yaml +++ b/charts/cbcontainers-operator/cbcontainers-operator-chart/templates/deployment.yaml @@ -37,6 +37,7 @@ spec: - --secure-listen-address=0.0.0.0:8443 - --upstream=http://127.0.0.1:8080/ - --logtostderr=true + - --http2-disable - --v=0 image: "{{ .Values.rbacProxy.image.repository }}:{{.Values.rbacProxy.image.version }}" name: kube-rbac-proxy diff --git a/charts/cbcontainers-operator/cbcontainers-operator-chart/values.yaml b/charts/cbcontainers-operator/cbcontainers-operator-chart/values.yaml index c42c7acd..c1c02ba2 100644 --- a/charts/cbcontainers-operator/cbcontainers-operator-chart/values.yaml +++ b/charts/cbcontainers-operator/cbcontainers-operator-chart/values.yaml @@ -12,7 +12,7 @@ operator: rbacProxy: image: repository: "cbartifactory/kube-rbac-proxy" - version: "v0.14.2" + version: "v0.15.0-containers" resources: limits: cpu: 100m diff --git a/config/operator/manager_auth_proxy_patch.yaml b/config/operator/manager_auth_proxy_patch.yaml index d9ae28be..b77575d6 100644 --- a/config/operator/manager_auth_proxy_patch.yaml +++ b/config/operator/manager_auth_proxy_patch.yaml @@ -10,11 +10,12 @@ spec: spec: containers: - name: kube-rbac-proxy - image: cbartifactory/kube-rbac-proxy:v0.14.2 + image: cbartifactory/kube-rbac-proxy:v0.15.0-containers args: - "--secure-listen-address=0.0.0.0:8443" - "--upstream=http://127.0.0.1:8080/" - "--logtostderr=true" + - "--http2-disable" - "--v=0" ports: - containerPort: 8443 diff --git a/docs/Main.md b/docs/Main.md index a3864a23..5b5d86d1 100644 --- a/docs/Main.md +++ b/docs/Main.md @@ -14,11 +14,12 @@ The Carbon Black Cloud Container Operator utilizes the operator-framework to cre ## Compatibility Matrix -| Operator version | Kubernetes Sensor Component Version | Minimum Kubernetes Version | -|------------------|-------------------------------------|----------------------------| -| v6.0.x | 2.10.0, 2.11.0, 2.12.0, 3.0.0 | 1.18 | -| v5.6.x | 2.10.0, 2.11.0, 2.12.0 | 1.16 | -| v5.5.x | 2.10.0, 2.11.0 | 1.16 | +| Operator version | Kubernetes Sensor Component Version | Minimum Kubernetes Version | +|------------------|--------------------------------------|----------------------------| +| v6.1.x | 2.10.0, 2.11.0, 2.12.0, 3.0.X, 3.1.X | 1.18 | +| v6.0.x | 2.10.0, 2.11.0, 2.12.0, 3.0.X, 3.1.X | 1.18 | +| v5.6.x | 2.10.0, 2.11.0, 2.12.0 | 1.16 | +| v5.5.x | 2.10.0, 2.11.0 | 1.16 | ## Install @@ -42,7 +43,7 @@ For OpenShift clusters, follow the OpenShift Deployment instructions: ### Uninstalling the Carbon Black Cloud Container Operator ```sh -export OPERATOR_VERSION=v6.0.2 +export OPERATOR_VERSION=v6.1.0 export OPERATOR_SCRIPT_URL=https://setup.containers.carbonblack.io/$OPERATOR_VERSION/operator-apply.sh curl -s $OPERATOR_SCRIPT_URL | bash -s -- -u ``` diff --git a/docs/OperatorDeployment.md b/docs/OperatorDeployment.md index a1941e7d..bb062e7d 100644 --- a/docs/OperatorDeployment.md +++ b/docs/OperatorDeployment.md @@ -5,7 +5,7 @@ Kubernetes 1.18+ is supported. ### From script: ``` -export OPERATOR_VERSION=v6.0.2 +export OPERATOR_VERSION=v6.1.0 export OPERATOR_SCRIPT_URL=https://setup.containers.carbonblack.io/$OPERATOR_VERSION/operator-apply.sh curl -s $OPERATOR_SCRIPT_URL | bash ``` diff --git a/docs/developers.md b/docs/developers.md index 02957a1f..c40796ce 100644 --- a/docs/developers.md +++ b/docs/developers.md @@ -2,7 +2,7 @@ ## Developer Guide -SDK version = 1.29.0 +SDK version = 1.32.0 ### Deploying the operator without using an image diff --git a/go.mod b/go.mod index abbad6c3..1df4c48e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/vmware/cbcontainers-operator -go 1.19 +go 1.21 require ( github.com/cloudflare/cfssl v1.4.1 @@ -55,12 +55,12 @@ require ( github.com/zmap/zlint v0.0.0-20190806154020-fd021b4cfbeb // indirect go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect - golang.org/x/crypto v0.1.0 // indirect - golang.org/x/net v0.7.0 // indirect + golang.org/x/crypto v0.14.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/term v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/go.sum b/go.sum index 48140b04..9dec549e 100644 --- a/go.sum +++ b/go.sum @@ -77,6 +77,7 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= +github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= @@ -239,7 +240,9 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWb github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E= github.com/onsi/ginkgo/v2 v2.6.0 h1:9t9b9vRUbFq3C4qKFCGkVuq/fIHji802N1nrtkh1mNc= +github.com/onsi/ginkgo/v2 v2.6.0/go.mod h1:63DOGlLAH8+REH8jUGdL3YpCpu7JODesutUjdENfUAc= github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E= +github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -319,6 +322,7 @@ go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= 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 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= @@ -331,8 +335,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= -golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -397,8 +401,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -460,12 +464,12 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -473,8 +477,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=