From d49201708c1e1884fedcd20391dc04aecc8c3209 Mon Sep 17 00:00:00 2001 From: Gabe Alford Date: Thu, 21 Dec 2023 14:28:36 -0700 Subject: [PATCH] feat: update to operator-sdk version 1.33.0 - update to go version 1.20 --- .github/workflows/docs.yml | 2 +- .github/workflows/go.yml | 4 +- .github/workflows/operator-deployment.yml | 2 +- .github/workflows/operator-metadata.yml | 2 +- .github/workflows/release.yml | 2 +- Makefile | 4 +- PROJECT | 4 +- bundle.Dockerfile | 4 +- ...falcon-operator.clusterserviceversion.yaml | 8 +- ...con.crowdstrike.com_falconnodesensors.yaml | 3 + bundle/metadata/annotations.yaml | 4 +- bundle/tests/scorecard/config.yaml | 12 +- cmd/main.go | 2 - config/crd/kustomization.yaml | 16 +-- .../cainjection_in_falconadmissions.yaml | 2 +- .../cainjection_in_falconcontainers.yaml | 2 +- .../cainjection_in_falconnodesensors.yaml | 2 +- config/default/kustomization.yaml | 134 ++++++++++++++---- config/default/manager_auth_proxy_patch.yaml | 2 +- config/manager/manager.yaml | 2 + config/manifests/kustomization.yaml | 3 +- config/rbac/falconadmission_editor_role.yaml | 2 +- config/rbac/falconadmission_viewer_role.yaml | 2 +- config/samples/kustomization.yaml | 4 +- config/scorecard/patches/basic.config.yaml | 2 +- config/scorecard/patches/olm.config.yaml | 10 +- docs/developer_guide.md | 4 +- go.mod | 2 +- 28 files changed, 159 insertions(+), 83 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index efe4b94d..6f48398e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -33,7 +33,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - go-version: [1.19.x] + go-version: [1.20.x] runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index fccf0935..b1503959 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - go-version: [1.19.x] + go-version: [1.20.x] runs-on: ${{ matrix.os }} steps: @@ -51,7 +51,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - go-version: [1.19.x] + go-version: [1.20.x] runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/operator-deployment.yml b/.github/workflows/operator-deployment.yml index ccb9f2b3..4b617df4 100644 --- a/.github/workflows/operator-deployment.yml +++ b/.github/workflows/operator-deployment.yml @@ -29,7 +29,7 @@ jobs: steps: - uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: [1.20.x] - uses: actions/checkout@v4 with: diff --git a/.github/workflows/operator-metadata.yml b/.github/workflows/operator-metadata.yml index 9823dcc2..dc7e787a 100644 --- a/.github/workflows/operator-metadata.yml +++ b/.github/workflows/operator-metadata.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - go-version: [1.19.x] + go-version: [1.20.x] runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7075f7b2..d03b7110 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -173,7 +173,7 @@ jobs: strategy: fail-fast: false matrix: - go-version: [1.18.x] + go-version: [1.20.x] steps: - name: Install qemu dependency diff --git a/Makefile b/Makefile index ee524f0d..81fd1a4c 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ endif # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v1.30.0 +OPERATOR_SDK_VERSION ?= v1.33.0 # Image URL to use all building/pushing image targets IMG ?= controller:latest @@ -259,7 +259,7 @@ endif .PHONY: bundle bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files. - $(OPERATOR_SDK) generate kustomize manifests --interactive=false -q --apis-dir api + $(OPERATOR_SDK) generate kustomize manifests -q --apis-dir api cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG) $(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS) $(OPERATOR_SDK) bundle validate ./bundle diff --git a/PROJECT b/PROJECT index 64569b13..3028af5b 100644 --- a/PROJECT +++ b/PROJECT @@ -4,9 +4,9 @@ # More info: https://book.kubebuilder.io/reference/project-config.html componentConfig: true domain: crowdstrike.com -multigroup: true layout: -- go.kubebuilder.io/v4-alpha +- go.kubebuilder.io/v4 +multigroup: true plugins: manifests.sdk.operatorframework.io/v2: {} scorecard.sdk.operatorframework.io/v2: {} diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 8877c0ff..f8362984 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -6,9 +6,9 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=falcon-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.30.0 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.33.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 -LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4-alpha +LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4 # Labels for testing. LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1 diff --git a/bundle/manifests/falcon-operator.clusterserviceversion.yaml b/bundle/manifests/falcon-operator.clusterserviceversion.yaml index 4103c5bf..dd5cf9d4 100644 --- a/bundle/manifests/falcon-operator.clusterserviceversion.yaml +++ b/bundle/manifests/falcon-operator.clusterserviceversion.yaml @@ -101,11 +101,11 @@ metadata: capabilities: Basic Install categories: Security,Monitoring containerImage: quay.io/crowdstrike/falcon-operator - createdAt: "2023-11-03T15:07:51Z" + createdAt: "2023-12-21T21:26:46Z" description: Falcon Operator installs CrowdStrike Falcon Sensors on the cluster operatorframework.io/suggested-namespace: falcon-operator - operators.operatorframework.io/builder: operator-sdk-v1.30.0 - operators.operatorframework.io/project_layout: go.kubebuilder.io/v4-alpha + operators.operatorframework.io/builder: operator-sdk-v1.33.0 + operators.operatorframework.io/project_layout: go.kubebuilder.io/v4 repository: https://github.com/CrowdStrike/falcon-operator support: Community Only name: falcon-operator.v0.9.1 @@ -1053,7 +1053,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=0 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1 + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1 name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/bundle/manifests/falcon.crowdstrike.com_falconnodesensors.yaml b/bundle/manifests/falcon.crowdstrike.com_falconnodesensors.yaml index 1c1ddd1c..f9c57190 100644 --- a/bundle/manifests/falcon.crowdstrike.com_falconnodesensors.yaml +++ b/bundle/manifests/falcon.crowdstrike.com_falconnodesensors.yaml @@ -464,6 +464,9 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/control-plane operator: Exists + - effect: NoSchedule + key: node-role.kubernetes.io/infra + operator: Exists description: Specifies tolerations for custom taints. Defaults to allowing scheduling on all nodes. items: diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 12db1b84..76f016f2 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -5,9 +5,9 @@ annotations: operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: falcon-operator operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.metrics.builder: operator-sdk-v1.30.0 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.33.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 - operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4-alpha + operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4 # Annotations for testing. operators.operatorframework.io.test.mediatype.v1: scorecard+v1 diff --git a/bundle/tests/scorecard/config.yaml b/bundle/tests/scorecard/config.yaml index 104883e2..d5b4b3e4 100644 --- a/bundle/tests/scorecard/config.yaml +++ b/bundle/tests/scorecard/config.yaml @@ -8,7 +8,7 @@ stages: - entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.33.0 labels: suite: basic test: basic-check-spec-test @@ -18,7 +18,7 @@ stages: - entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.33.0 labels: suite: olm test: olm-bundle-validation-test @@ -28,7 +28,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.33.0 labels: suite: olm test: olm-crds-have-validation-test @@ -38,7 +38,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.33.0 labels: suite: olm test: olm-crds-have-resources-test @@ -48,7 +48,7 @@ stages: - entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.33.0 labels: suite: olm test: olm-spec-descriptors-test @@ -58,7 +58,7 @@ stages: - entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.33.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/cmd/main.go b/cmd/main.go index 3f93afac..c6ae4641 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -28,7 +28,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" imagev1 "github.com/openshift/api/image/v1" - securityv1 "github.com/openshift/api/security/v1" arv1 "k8s.io/api/admissionregistration/v1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -52,7 +51,6 @@ var ( func init() { utilruntime.Must(clientgoscheme.AddToScheme(scheme)) utilruntime.Must(imagev1.AddToScheme(scheme)) - utilruntime.Must(securityv1.AddToScheme(scheme)) utilruntime.Must(falconv1alpha1.AddToScheme(scheme)) // +kubebuilder:scaffold:scheme diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 2e3a3c57..f8c85497 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -2,24 +2,24 @@ # since it depends on service name and namespace that are out of this kustomize package. # It should be run by config/default resources: +- bases/falcon.crowdstrike.com_falconadmissions.yaml - bases/falcon.crowdstrike.com_falconcontainers.yaml - bases/falcon.crowdstrike.com_falconnodesensors.yaml -- bases/falcon.crowdstrike.com_falconadmissions.yaml #+kubebuilder:scaffold:crdkustomizeresource -patchesStrategicMerge: +patches: # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix. # patches here are for enabling the conversion webhook for each CRD -#- patches/webhook_in_falconcontainers.yaml -#- patches/webhook_in_falconnodesensors.yaml -#- patches/webhook_in_falconadmissions.yaml +#- path: patches/webhook_in_falconadmissions.yaml +#- path: patches/webhook_in_falconcontainers.yaml +#- path: patches/webhook_in_falconnodesensors.yaml #+kubebuilder:scaffold:crdkustomizewebhookpatch # [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix. # patches here are for enabling the CA injection for each CRD -#- patches/cainjection_in_falconcontainers.yaml -#- patches/cainjection_in_falconnodesensors.yaml -#- patches/cainjection_in_falconadmissions.yaml +#- path: patches/cainjection_in_falconadmissions.yaml +#- path: patches/cainjection_in_falconcontainers.yaml +#- path: patches/cainjection_in_falconnodesensors.yaml #+kubebuilder:scaffold:crdkustomizecainjectionpatch # the following config is for teaching kustomize how to do kustomization for CRDs. diff --git a/config/crd/patches/cainjection_in_falconadmissions.yaml b/config/crd/patches/cainjection_in_falconadmissions.yaml index 07cd29f6..e0b316e5 100644 --- a/config/crd/patches/cainjection_in_falconadmissions.yaml +++ b/config/crd/patches/cainjection_in_falconadmissions.yaml @@ -3,5 +3,5 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME) + cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME name: falconadmissions.falcon.crowdstrike.com diff --git a/config/crd/patches/cainjection_in_falconcontainers.yaml b/config/crd/patches/cainjection_in_falconcontainers.yaml index f05b9bdd..0d4d7442 100644 --- a/config/crd/patches/cainjection_in_falconcontainers.yaml +++ b/config/crd/patches/cainjection_in_falconcontainers.yaml @@ -3,5 +3,5 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME) + cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME name: falconcontainers.falcon.crowdstrike.com diff --git a/config/crd/patches/cainjection_in_falconnodesensors.yaml b/config/crd/patches/cainjection_in_falconnodesensors.yaml index d22f4edb..e63b2d61 100644 --- a/config/crd/patches/cainjection_in_falconnodesensors.yaml +++ b/config/crd/patches/cainjection_in_falconnodesensors.yaml @@ -3,5 +3,5 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME) + cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME name: falconnodesensors.falcon.crowdstrike.com diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index c6643cb8..7f925c55 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -9,10 +9,12 @@ namespace: falcon-operator-system namePrefix: falcon-operator- # Labels to add to all resources and selectors. -#commonLabels: -# someName: someValue +#labels: +#- includeSelectors: true +# pairs: +# someName: someValue -bases: +resources: - ../crd - ../rbac - ../manager @@ -44,32 +46,102 @@ patchesStrategicMerge: # 'CERTMANAGER' needs to be enabled to use ca injection #- webhookcainjection_patch.yaml -# the following config is for teaching kustomize how to do var substitution -vars: # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER' prefix. -#- name: CERTIFICATE_NAMESPACE # namespace of the certificate CR -# objref: -# kind: Certificate -# group: cert-manager.io -# version: v1 -# name: serving-cert # this name should match the one in certificate.yaml -# fieldref: -# fieldpath: metadata.namespace -#- name: CERTIFICATE_NAME -# objref: -# kind: Certificate -# group: cert-manager.io -# version: v1 -# name: serving-cert # this name should match the one in certificate.yaml -#- name: SERVICE_NAMESPACE # namespace of the service -# objref: -# kind: Service -# version: v1 -# name: webhook-service -# fieldref: -# fieldpath: metadata.namespace -#- name: SERVICE_NAME -# objref: -# kind: Service -# version: v1 -# name: webhook-service +# Uncomment the following replacements to add the cert-manager CA injection annotations +#replacements: +# - source: # Add cert-manager annotation to ValidatingWebhookConfiguration, MutatingWebhookConfiguration and CRDs +# kind: Certificate +# group: cert-manager.io +# version: v1 +# name: serving-cert # this name should match the one in certificate.yaml +# fieldPath: .metadata.namespace # namespace of the certificate CR +# targets: +# - select: +# kind: ValidatingWebhookConfiguration +# fieldPaths: +# - .metadata.annotations.[cert-manager.io/inject-ca-from] +# options: +# delimiter: '/' +# index: 0 +# create: true +# - select: +# kind: MutatingWebhookConfiguration +# fieldPaths: +# - .metadata.annotations.[cert-manager.io/inject-ca-from] +# options: +# delimiter: '/' +# index: 0 +# create: true +# - select: +# kind: CustomResourceDefinition +# fieldPaths: +# - .metadata.annotations.[cert-manager.io/inject-ca-from] +# options: +# delimiter: '/' +# index: 0 +# create: true +# - source: +# kind: Certificate +# group: cert-manager.io +# version: v1 +# name: serving-cert # this name should match the one in certificate.yaml +# fieldPath: .metadata.name +# targets: +# - select: +# kind: ValidatingWebhookConfiguration +# fieldPaths: +# - .metadata.annotations.[cert-manager.io/inject-ca-from] +# options: +# delimiter: '/' +# index: 1 +# create: true +# - select: +# kind: MutatingWebhookConfiguration +# fieldPaths: +# - .metadata.annotations.[cert-manager.io/inject-ca-from] +# options: +# delimiter: '/' +# index: 1 +# create: true +# - select: +# kind: CustomResourceDefinition +# fieldPaths: +# - .metadata.annotations.[cert-manager.io/inject-ca-from] +# options: +# delimiter: '/' +# index: 1 +# create: true +# - source: # Add cert-manager annotation to the webhook Service +# kind: Service +# version: v1 +# name: webhook-service +# fieldPath: .metadata.name # namespace of the service +# targets: +# - select: +# kind: Certificate +# group: cert-manager.io +# version: v1 +# fieldPaths: +# - .spec.dnsNames.0 +# - .spec.dnsNames.1 +# options: +# delimiter: '.' +# index: 0 +# create: true +# - source: +# kind: Service +# version: v1 +# name: webhook-service +# fieldPath: .metadata.namespace # namespace of the service +# targets: +# - select: +# kind: Certificate +# group: cert-manager.io +# version: v1 +# fieldPaths: +# - .spec.dnsNames.0 +# - .spec.dnsNames.1 +# options: +# delimiter: '.' +# index: 1 +# create: true diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml index 7945f64a..98814f4a 100644 --- a/config/default/manager_auth_proxy_patch.yaml +++ b/config/default/manager_auth_proxy_patch.yaml @@ -31,7 +31,7 @@ spec: capabilities: drop: - "ALL" - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1 + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1 args: - "--secure-listen-address=0.0.0.0:8443" - "--upstream=http://127.0.0.1:8080/" diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 3cc081d2..ae3af789 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -70,6 +70,8 @@ spec: - name: WATCH_NAMESPACE - name: OPERATOR_NAME value: "falcon-operator" + #- name: RELATED_IMAGE_ADMISSION_CONTROLLER + # image: "" #- name: RELATED_IMAGE_NODE_SENSOR # image: "" #- name: RELATED_IMAGE_SIDECAR_SENSOR diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml index 591e50ff..623ae9a7 100644 --- a/config/manifests/kustomization.yaml +++ b/config/manifests/kustomization.yaml @@ -20,7 +20,8 @@ resources: # # Remove the manager container's "cert" volumeMount, since OLM will create and mount a set of certs. # # Update the indices in this path if adding or removing containers/volumeMounts in the manager's Deployment. # - op: remove -# path: /spec/template/spec/containers/1/volumeMounts/0 + +# path: /spec/template/spec/containers/0/volumeMounts/0 # # Remove the "cert" volume, since OLM will create and mount a set of certs. # # Update the indices in this path if adding or removing volumes in the manager's Deployment. # - op: remove diff --git a/config/rbac/falconadmission_editor_role.yaml b/config/rbac/falconadmission_editor_role.yaml index 8721b2e2..9be6eb65 100644 --- a/config/rbac/falconadmission_editor_role.yaml +++ b/config/rbac/falconadmission_editor_role.yaml @@ -10,7 +10,7 @@ metadata: crowdstrike.com/name: clusterrole crowdstrike.com/part-of: Falcon crowdstrike.com/provider: crowdstrike - name: falconcontainer-editor-role + name: falconadmission-editor-role rules: - apiGroups: - falcon.crowdstrike.com diff --git a/config/rbac/falconadmission_viewer_role.yaml b/config/rbac/falconadmission_viewer_role.yaml index f2e709f9..f051c956 100644 --- a/config/rbac/falconadmission_viewer_role.yaml +++ b/config/rbac/falconadmission_viewer_role.yaml @@ -10,7 +10,7 @@ metadata: crowdstrike.com/name: clusterrole crowdstrike.com/part-of: Falcon crowdstrike.com/provider: crowdstrike - name: falconcontainer-viewer-role + name: falconadmission-viewer-role rules: - apiGroups: - falcon.crowdstrike.com diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml index 34049c9f..c7e6491c 100644 --- a/config/samples/kustomization.yaml +++ b/config/samples/kustomization.yaml @@ -1,6 +1,6 @@ -## Append samples you want in your CSV to this file as resources ## +## Append samples of your project ## resources: +- falcon_v1alpha1_falconadmission.yaml - falcon_v1alpha1_falconcontainer.yaml - falcon_v1alpha1_falconnodesensor.yaml -- falcon_v1alpha1_falconadmission.yaml #+kubebuilder:scaffold:manifestskustomizesamples diff --git a/config/scorecard/patches/basic.config.yaml b/config/scorecard/patches/basic.config.yaml index c95b4ec1..a2f15894 100644 --- a/config/scorecard/patches/basic.config.yaml +++ b/config/scorecard/patches/basic.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.33.0 labels: suite: basic test: basic-check-spec-test diff --git a/config/scorecard/patches/olm.config.yaml b/config/scorecard/patches/olm.config.yaml index f6607c2d..9b7ca41b 100644 --- a/config/scorecard/patches/olm.config.yaml +++ b/config/scorecard/patches/olm.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.33.0 labels: suite: olm test: olm-bundle-validation-test @@ -14,7 +14,7 @@ entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.33.0 labels: suite: olm test: olm-crds-have-validation-test @@ -24,7 +24,7 @@ entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.33.0 labels: suite: olm test: olm-crds-have-resources-test @@ -34,7 +34,7 @@ entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.33.0 labels: suite: olm test: olm-spec-descriptors-test @@ -44,7 +44,7 @@ entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.33.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/docs/developer_guide.md b/docs/developer_guide.md index 00a30f80..171fbdc3 100644 --- a/docs/developer_guide.md +++ b/docs/developer_guide.md @@ -5,8 +5,8 @@ The following tools are required to develop the Falcon Operator: - [git][git-tool] -- [go][go-tool] version 1.19 -- [operator-sdk][operator-sdk] version 1.22.0 +- [go][go-tool] version 1.20 +- [operator-sdk][operator-sdk] version 1.33.0 - [docker][docker] (required for multi-arch builds) or [podman][podman] (if desired for single arch builds) Running `make` at any point will install additional tooling and go dependencies as required by the various `Makefile` targets. For example: diff --git a/go.mod b/go.mod index de7e2570..e63ebb70 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/crowdstrike/falcon-operator -go 1.19 +go 1.20 require ( github.com/Masterminds/sprig/v3 v3.2.3