Skip to content

Instantly share code, notes, and snippets.

@jmrodri

jmrodri/foo.diff

Created October 27, 2020 21:53
Show Gist options
  • Save jmrodri/24bae193c8ee24091b244e70bb18c951 to your computer and use it in GitHub Desktop.
Save jmrodri/24bae193c8ee24091b244e70bb18c951 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
foo.diff
diff --git a/ansible/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml b/ansible/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml
index fb08714..bd4f5a8 100644
--- a/ansible/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml
+++ b/ansible/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml
@@ -107,6 +107,16 @@ spec:
control-plane: controller-manager
spec:
containers:
+ - args:
+ - --metrics-addr=127.0.0.1:8080
+ - --enable-leader-election
+ - --leader-election-id=memcached-operator
+ env:
+ - name: ANSIBLE_GATHERING
+ value: explicit
+ image: quay.io/example-inc/memcached-operator:v0.0.1
+ name: manager
+ resources: {}
- args:
- --secure-listen-address=0.0.0.0:8443
- --upstream=http://127.0.0.1:8080/
@@ -118,16 +128,6 @@ spec:
- containerPort: 8443
name: https
resources: {}
- - args:
- - --metrics-addr=127.0.0.1:8080
- - --enable-leader-election
- - --leader-election-id=memcached-operator
- env:
- - name: ANSIBLE_GATHERING
- value: explicit
- image: quay.io/example-inc/memcached-operator:v0.0.1
- name: manager
- resources: {}
terminationGracePeriodSeconds: 10
permissions:
- rules:
diff --git a/go/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml b/go/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml
index adf470d..353107d 100644
--- a/go/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml
+++ b/go/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml
@@ -104,17 +104,6 @@ spec:
control-plane: controller-manager
spec:
containers:
- - args:
- - --secure-listen-address=0.0.0.0:8443
- - --upstream=http://127.0.0.1:8080/
- - --logtostderr=true
- - --v=10
- image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
- name: kube-rbac-proxy
- ports:
- - containerPort: 8443
- name: https
- resources: {}
- args:
- --metrics-addr=127.0.0.1:8080
- --enable-leader-election
@@ -137,6 +126,17 @@ spec:
- mountPath: /tmp/k8s-webhook-server/serving-certs
name: cert
readOnly: true
+ - args:
+ - --secure-listen-address=0.0.0.0:8443
+ - --upstream=http://127.0.0.1:8080/
+ - --logtostderr=true
+ - --v=10
+ image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
+ name: kube-rbac-proxy
+ ports:
+ - containerPort: 8443
+ name: https
+ resources: {}
terminationGracePeriodSeconds: 10
volumes:
- name: cert
diff --git a/go/memcached-operator/packagemanifests/0.0.1/memcached-operator.clusterserviceversion.yaml b/go/memcached-operator/packagemanifests/0.0.1/memcached-operator.clusterserviceversion.yaml
index ab3eb90..2bb04fd 100644
--- a/go/memcached-operator/packagemanifests/0.0.1/memcached-operator.clusterserviceversion.yaml
+++ b/go/memcached-operator/packagemanifests/0.0.1/memcached-operator.clusterserviceversion.yaml
@@ -104,17 +104,6 @@ spec:
control-plane: controller-manager
spec:
containers:
- - args:
- - --secure-listen-address=0.0.0.0:8443
- - --upstream=http://127.0.0.1:8080/
- - --logtostderr=true
- - --v=10
- image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
- name: kube-rbac-proxy
- ports:
- - containerPort: 8443
- name: https
- resources: {}
- args:
- --metrics-addr=127.0.0.1:8080
- --enable-leader-election
@@ -137,6 +126,17 @@ spec:
- mountPath: /tmp/k8s-webhook-server/serving-certs
name: cert
readOnly: true
+ - args:
+ - --secure-listen-address=0.0.0.0:8443
+ - --upstream=http://127.0.0.1:8080/
+ - --logtostderr=true
+ - --v=10
+ image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
+ name: kube-rbac-proxy
+ ports:
+ - containerPort: 8443
+ name: https
+ resources: {}
terminationGracePeriodSeconds: 10
volumes:
- name: cert
diff --git a/helm/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml b/helm/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml
index f4e30f4..14b62d2 100644
--- a/helm/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml
+++ b/helm/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml
@@ -108,15 +108,15 @@ spec:
- update
- watch
- apiGroups:
- - ""
+ - apps
resources:
- - services
+ - statefulsets
verbs:
- '*'
- apiGroups:
- - apps
+ - ""
resources:
- - statefulsets
+ - services
verbs:
- '*'
- apiGroups:
@@ -160,17 +160,6 @@ spec:
control-plane: controller-manager
spec:
containers:
- - args:
- - --secure-listen-address=0.0.0.0:8443
- - --upstream=http://127.0.0.1:8080/
- - --logtostderr=true
- - --v=10
- image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
- name: kube-rbac-proxy
- ports:
- - containerPort: 8443
- name: https
- resources: {}
- args:
- --metrics-addr=127.0.0.1:8080
- --enable-leader-election
@@ -184,6 +173,17 @@ spec:
requests:
cpu: 100m
memory: 60Mi
+ - args:
+ - --secure-listen-address=0.0.0.0:8443
+ - --upstream=http://127.0.0.1:8080/
+ - --logtostderr=true
+ - --v=10
+ image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
+ name: kube-rbac-proxy
+ ports:
+ - containerPort: 8443
+ name: https
+ resources: {}
terminationGracePeriodSeconds: 10
permissions:
- rules:
diff --git a/helm/memcached-operator/config/rbac/role.yaml b/helm/memcached-operator/config/rbac/role.yaml
index a68c3b4..c7afe24 100644
--- a/helm/memcached-operator/config/rbac/role.yaml
+++ b/helm/memcached-operator/config/rbac/role.yaml
@@ -47,15 +47,15 @@ rules:
- verbs:
- "*"
apiGroups:
- - ""
+ - "apps"
resources:
- - "services"
+ - "statefulsets"
- verbs:
- "*"
apiGroups:
- - "apps"
+ - ""
resources:
- - "statefulsets"
+ - "services"
##
## Rules customized for cache.example.com/v1alpha1, Kind: Memcached
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment