Skip to content

Commit

Permalink
Disable the propagator webhook
Browse files Browse the repository at this point in the history
A webhook was added, but it requires cert-manager as a prerequisite.
Until we can resolve/update that, leave it disabled by default.

Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
  • Loading branch information
dhaiducek committed Nov 4, 2023
1 parent ed10693 commit def0676
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ check-copyright:
@build/check-copyright.sh

.PHONY: test
test:
test: deps
@build/run-unit-tests.sh

.PHONY: clean-test
Expand Down
5 changes: 3 additions & 2 deletions pkg/cmd/create/sampleapp/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
package sampleapp

import (
"path/filepath"
"testing"

"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/client-go/discovery"
"k8s.io/client-go/discovery/cached/memory"
"k8s.io/client-go/restmapper"
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
"path/filepath"
"testing"

"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
Expand Down
3 changes: 2 additions & 1 deletion pkg/cmd/install/hubaddon/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package hubaddon

import (
"fmt"
"open-cluster-management.io/clusteradm/pkg/helpers/reader"
"os"
"strings"

"open-cluster-management.io/clusteradm/pkg/helpers/reader"

"github.com/spf13/cobra"
"k8s.io/klog/v2"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ rules:
- apiGroups:
- ""
resources:
- configmaps
- events
verbs:
- create
- delete
Expand All @@ -53,21 +53,19 @@ rules:
- apiGroups:
- ""
resources:
- events
- secrets
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resourceNames:
- governance-policy-database
resources:
- secrets
verbs:
- create
- get
- list
- watch
- apiGroups:
- ""
resourceNames:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ spec:
name: governance-policy-propagator
template:
metadata:
annotations:
kubectl.kubernetes.io/default-container: governance-policy-propagator
labels:
name: governance-policy-propagator
spec:
Expand All @@ -19,6 +21,7 @@ spec:
- --health-probe-bind-address=:8081
- --metrics-bind-address=:8383
- --leader-elect
- --enable-webhooks=false
command:
- governance-policy-propagator
env:
Expand All @@ -30,6 +33,10 @@ spec:
fieldPath: metadata.name
- name: OPERATOR_NAME
value: governance-policy-propagator
- name: WATCH_NAMESPACE_COMPLIANCE_EVENTS_STORE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: quay.io/open-cluster-management/governance-policy-propagator:{{ .BundleVersion.PolicyAddon }}
imagePullPolicy: Always
name: governance-policy-propagator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,6 @@ metadata:
name: governance-policy-propagator-leader-election-role
namespace: {{ .Namespace }}
rules:
- apiGroups:
- ""
resources:
- configmaps
verbs:
- get
- list
- watch
- create
- update
- patch
- delete
- apiGroups:
- coordination.k8s.io
resources:
Expand Down

0 comments on commit def0676

Please sign in to comment.