Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #491 from openshift-cherrypick-robot/cherry-pick-4…
…85-to-release-4.9

[release-4.9] Bug 2047331: global pull secret not working in OCP4.7.4+ for additio…
  • Loading branch information
openshift-merge-robot committed Feb 4, 2022
2 parents 13dbfe9 + eca14e5 commit d293c31
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
6 changes: 3 additions & 3 deletions bindata/v3.11.0/openshift-apiserver/deploy.yaml
Expand Up @@ -93,7 +93,7 @@ spec:
ports:
- containerPort: 8443
volumeMounts:
- mountPath: /var/lib/kubelet/config.json
- mountPath: /var/lib/kubelet/
name: node-pullsecrets
readOnly: true
- mountPath: /var/run/configmaps/config
Expand Down Expand Up @@ -161,8 +161,8 @@ spec:
volumes:
- name: node-pullsecrets
hostPath:
path: /var/lib/kubelet/config.json
type: File
path: /var/lib/kubelet/
type: Directory
- name: config
configMap:
name: config
Expand Down
1 change: 1 addition & 0 deletions pkg/dependencymagnet/doc.go
@@ -1,3 +1,4 @@
//go:build tools
// +build tools

// go mod won't pull in code that isn't depended upon, but we have some code we don't depend on from code that must be included
Expand Down
6 changes: 3 additions & 3 deletions pkg/operator/v311_00_assets/bindata.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d293c31

Please sign in to comment.