CRDs: Fix typo: EnforcedNamepsaceLabel -> EnforcedNamespaceLabel

Makefile

@@ -51,7 +51,7 @@ CROSS_BUILD ?= false
 # run make BUILD_IN_CONTAINER=false <target>, or you can set BUILD_IN_CONTAINER=true
 # as an environment variable.
 BUILD_IN_CONTAINER ?= true
-BUILD_IMAGE_VERSION := 0.11.0
+BUILD_IMAGE_VERSION := 0.12.0
 BUILD_IMAGE := $(IMAGE_PREFIX)/agent-build-image:$(BUILD_IMAGE_VERSION)
 
 # Enables the binary to be built with optimizations (i.e., doesn't strip the image of

build-image/Dockerfile

@@ -11,7 +11,8 @@ RUN apt-get update && apt-get install -y \
   && rm -rf /var/lib/apt/lists/*
 
 # Install dependencies used for the operator
-RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@latest
+# Keep versions in sync with cmd/agent-operator/DEVELOPERS.md
+RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.2
 
 # Fix permissions for /go/bin directory.
 RUN chmod 0755 /go/bin

cmd/agent-operator/DEVELOPERS.md

@@ -33,10 +33,11 @@ goes into more detail about the context and design decisions being made.
 The `make crds` command at the root of this repository will generate CRDs and
 other code used by the operator. This calls the [generate-crds
 script](../../tools/generate-crds.bash) in a container. If you wish to call this
-script manually, you must also install `controller-gen`:
+script manually, you must also install `controller-gen`.
+Ensure to keep the version in sync with what's defined in the `Dockerfile`.
 
 ```
-go install sigs.k8s.io/controller-tools/cmd/controller-gen@latest
+go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.2
 ```
 
 ## Testing Locally

pkg/operator/apis/monitoring/v1alpha1/types_metrics.go

@@ -52,10 +52,10 @@ type PrometheusSubsystemSpec struct {
 	// from the PodMonitor and ServiceMonitor configs, and they will only
 	// discover endpoints within their current namespace.
 	IgnoreNamespaceSelectors bool `json:"ignoreNamespaceSelectors,omitempty"`
-	// EnforcedNamepsaceLabel enforces adding a namespace label of origin for
+	// EnforcedNamespaceLabel enforces adding a namespace label of origin for
 	// each metric that is user-created. The label value will always be the
 	// namespace of the object that is being created.
-	EnforcedNamepsaceLabel string `json:"enforcedNamespaceLabel,omitempty"`
+	EnforcedNamespaceLabel string `json:"enforcedNamespaceLabel,omitempty"`
 	// EnforcedSampleLimit defines global limit on the number of scraped samples
 	// that will be accepted. This overrides any SampleLimit set per
 	// ServiceMonitor and/or PodMonitor. It is meant to be used by admins to

pkg/operator/config/templates/agent-logs.libsonnet

@@ -37,7 +37,7 @@ function(ctx) marshal.YAML(optionals.trim({
         instance=logs_inst,
         apiServer=spec.APIServerConfig,
         ignoreNamespaceSelectors=logs.IgnoreNamespaceSelectors,
-        enforcedNamespaceLabel=logs.EnforcedNamepsaceLabel,
+        enforcedNamespaceLabel=logs.EnforcedNamespaceLabel,
       ),
       ctx.Logs,
     )),

pkg/operator/config/templates/agent-metrics.libsonnet

@@ -54,7 +54,7 @@ function(ctx) marshal.YAML(optionals.trim({
         overrideHonorLabels=prometheus.OverrideHonorLabels,
         overrideHonorTimestamps=prometheus.OverrideHonorTimestamps,
         ignoreNamespaceSelectors=prometheus.IgnoreNamespaceSelectors,
-        enforcedNamespaceLabel=prometheus.EnforcedNamepsaceLabel,
+        enforcedNamespaceLabel=prometheus.EnforcedNamespaceLabel,
         enforcedSampleLimit=prometheus.EnforcedSampleLimit,
         enforcedTargetLimit=prometheus.EnforcedTargetLimit,
         shards=calculateShards(prometheus.Shards),